Merge tag 'nfs-for-3.6-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[deliverable/linux.git] / drivers / base / driver.c

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 1b500d6fcc2eec080a2acd6c457b773b64fde85d..974e301a1ef07ae02064be5e003bc4ac034df5c7 100644 (file)
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -185,9 +185,10 @@ 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;