Merge tag 'v3.6-rc4'

Merge 3.6-rc4 to get latest OMAP and device tree fixes.

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 207c27ddf828..974e301a1ef0 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -185,8 +185,12 @@ int driver_register(struct device_driver *drv)
         if (ret)
                 return ret;
         ret = driver_add_groups(drv, drv->groups);
-        if (ret)
+        if (ret) {
                 bus_remove_driver(drv);
+                return ret;
+        }
+        kobject_uevent(&drv->p->kobj, KOBJ_ADD);
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(driver_register);