Don't reference driver after you set pointer to NULL in device_detach

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 4b751c78228cbb1520d60441648071c442431bda..b1d4e5480ae1226e7edc4d03206b3de76bd58cd7 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -103,14 +103,14 @@ static void device_detach(struct device * dev)
                list_del_init(&dev->driver_list);
                write_unlock(&dev->driver->lock);
 
-               lock_device(dev);
-               dev->driver = NULL;
-               unlock_device(dev);
-
                /* detach from driver */
                if (dev->driver->remove)
                        dev->driver->remove(dev);
                put_driver(dev->driver);
+
+               lock_device(dev);
+               dev->driver = NULL;
+               unlock_device(dev);
        }
 }