Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  Driver Core: do not oops when driver_unregister() is called for unregistered drivers
  sysfs: file.c: use create_singlethread_workqueue()

4 files changed, 12 insertions, 3 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index dc030f1f00f1..c6599618523e 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -700,8 +700,10 @@ int bus_add_driver(struct device_driver *drv)
         }
 
         kobject_uevent(&priv->kobj, KOBJ_ADD);
-        return error;
+        return 0;
 out_unregister:
+        kfree(drv->p);
+        drv->p = NULL;
         kobject_put(&priv->kobj);
 out_put_bus:
         bus_put(bus);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 4aa527b8a913..1977d4beb89e 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -879,7 +879,7 @@ int device_add(struct device *dev)
         }
 
         if (!dev_name(dev))
-                goto done;
+                goto name_error;
 
         pr_debug("device: '%s': %s\n", dev_name(dev), __func__);
 
@@ -978,6 +978,9 @@ done:
         cleanup_device_parent(dev);
         if (parent)
                 put_device(parent);
+name_error:
+        kfree(dev->p);
+        dev->p = NULL;
         goto done;
 }
 
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index c51f11bb29ae..8ae0f63602e0 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -257,6 +257,10 @@ EXPORT_SYMBOL_GPL(driver_register);
  */
 void driver_unregister(struct device_driver *drv)
 {
+        if (!drv || !drv->p) {
+                WARN(1, "Unexpected driver unregister!\n");
+                return;
+        }
         driver_remove_groups(drv, drv->groups);
         bus_remove_driver(drv);
 }
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index b1606e07b7a3..561a9c050cef 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -723,7 +723,7 @@ int sysfs_schedule_callback(struct kobject *kobj, void (*func)(void *),
         mutex_unlock(&sysfs_workq_mutex);
 
         if (sysfs_workqueue == NULL) {
-                sysfs_workqueue = create_workqueue("sysfsd");
+                sysfs_workqueue = create_singlethread_workqueue("sysfsd");
                 if (sysfs_workqueue == NULL) {
                         module_put(owner);
                         return -ENOMEM;