Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[powerpc.git] / drivers / misc / tifm_core.c

diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c
index cca5f85..d61df5c 100644 (file)
--- a/drivers/misc/tifm_core.c
+++ b/drivers/misc/tifm_core.c
@@ -157,7 +157,7 @@ struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm, unsigned int id)
                dev->wq = create_singlethread_workqueue(dev->wq_name);
                if (!dev->wq) {
                        kfree(dev);
-                       return 0;
+                       return NULL;
                }
                dev->dev.parent = fm->dev;
                dev->dev.bus = &tifm_bus_type;
@@ -219,8 +219,9 @@ static int tifm_device_remove(struct device *dev)
        struct tifm_driver *drv = fm_dev->drv;
 
        if (drv) {
-               if (drv->remove) drv->remove(fm_dev);
-               fm_dev->drv = 0;
+               if (drv->remove)
+                       drv->remove(fm_dev);
+               fm_dev->drv = NULL;
        }
 
        put_device(dev);