Merge branch 'master' into upstream

2 files changed, 10 insertions, 10 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index b06b0e2b9c62..b32b77ff2dcd 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -228,7 +228,7 @@ error:
 
 /**
  * class_destroy - destroys a struct class structure
- * @cs: pointer to the struct class that is to be destroyed
+ * @cls: pointer to the struct class that is to be destroyed
  *
  * Note, the pointer to be destroyed must have been created with a call
  * to class_create().
@@ -658,9 +658,9 @@ int class_device_register(struct class_device *class_dev)
 
 /**
  * class_device_create - creates a class device and registers it with sysfs
- * @cs: pointer to the struct class that this device should be registered to.
+ * @cls: pointer to the struct class that this device should be registered to.
  * @parent: pointer to the parent struct class_device of this new device, if any.
- * @dev: the dev_t for the char device to be added.
+ * @devt: the dev_t for the char device to be added.
  * @device: a pointer to a struct device that is assiociated with this class device.
  * @fmt: string for the class device's name
  *
@@ -766,7 +766,7 @@ void class_device_unregister(struct class_device *class_dev)
 /**
  * class_device_destroy - removes a class device that was created with class_device_create()
  * @cls: the pointer to the struct class that this device was registered * with.
- * @dev: the dev_t of the device that was previously registered.
+ * @devt: the dev_t of the device that was previously registered.
  *
  * This call unregisters and cleans up a class device that was created with a
  * call to class_device_create()
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 77bf8826e2f9..14615694ae9a 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/mutex.h>
+#include <linux/kthread.h>
 
 #include <linux/firmware.h>
 #include "base.h"
@@ -511,7 +512,6 @@ request_firmware_work_func(void *arg)
                 WARN_ON(1);
                 return 0;
         }
-        daemonize("%s/%s", "firmware", fw_work->name);
         ret = _request_firmware(&fw, fw_work->name, fw_work->device,
                 fw_work->uevent);
         if (ret < 0)
@@ -546,9 +546,9 @@ request_firmware_nowait(
         const char *name, struct device *device, void *context,
         void (*cont)(const struct firmware *fw, void *context))
 {
+        struct task_struct *task;
         struct firmware_work *fw_work = kmalloc(sizeof (struct firmware_work),
                                                 GFP_ATOMIC);
-        int ret;
 
         if (!fw_work)
                 return -ENOMEM;
@@ -566,14 +566,14 @@ request_firmware_nowait(
                 .uevent = uevent,
         };
 
-        ret = kernel_thread(request_firmware_work_func, fw_work,
-                            CLONE_FS | CLONE_FILES);
+        task = kthread_run(request_firmware_work_func, fw_work,
+                            "firmware/%s", name);
 
-        if (ret < 0) {
+        if (IS_ERR(task)) {
                 fw_work->cont(NULL, fw_work->context);
                 module_put(fw_work->module);
                 kfree(fw_work);
-                return ret;
+                return PTR_ERR(task);
         }
         return 0;
 }