Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / base / bus.c

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index b802cfc..db41a4b 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -684,7 +684,7 @@ int bus_add_driver(struct device_driver *drv)
 
 out_unregister:
        kobject_put(&priv->kobj);
-       kfree(drv->p);
+       /* drv->p is freed in driver_release()  */
        drv->p = NULL;
 out_put_bus:
        bus_put(bus);