1 files changed, 15 insertions, 21 deletions

diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index acf210f16328..5c6d4d7ca605 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -2977,25 +2977,6 @@ void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn,
 }
 EXPORT_SYMBOL_GPL(fsg_common_set_inquiry_string);
 
-int fsg_common_run_thread(struct fsg_common *common)
-{
-        common->state = FSG_STATE_IDLE;
-        /* Tell the thread to start working */
-        common->thread_task =
-                kthread_create(fsg_main_thread, common, "file-storage");
-        if (IS_ERR(common->thread_task)) {
-                common->state = FSG_STATE_TERMINATED;
-                return PTR_ERR(common->thread_task);
-        }
-
-        DBG(common, "I/O thread pid: %d\n", task_pid_nr(common->thread_task));
-
-        wake_up_process(common->thread_task);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(fsg_common_run_thread);
-
 static void fsg_common_release(struct kref *ref)
 {
         struct fsg_common *common = container_of(ref, struct fsg_common, ref);
@@ -3005,6 +2986,7 @@ static void fsg_common_release(struct kref *ref)
         if (common->state != FSG_STATE_TERMINATED) {
                 raise_exception(common, FSG_STATE_EXIT);
                 wait_for_completion(&common->thread_notifier);
+                common->thread_task = NULL;
         }
 
         for (i = 0; i < ARRAY_SIZE(common->luns); ++i) {
@@ -3050,9 +3032,21 @@ static int fsg_bind(struct usb_configuration *c, struct usb_function *f)
                 if (ret)
                         return ret;
                 fsg_common_set_inquiry_string(fsg->common, NULL, NULL);
-                ret = fsg_common_run_thread(fsg->common);
-                if (ret)
+        }
+
+        if (!common->thread_task) {
+                common->state = FSG_STATE_IDLE;
+                common->thread_task =
+                        kthread_create(fsg_main_thread, common, "file-storage");
+                if (IS_ERR(common->thread_task)) {
+                        int ret = PTR_ERR(common->thread_task);
+                        common->thread_task = NULL;
+                        common->state = FSG_STATE_TERMINATED;
                         return ret;
+                }
+                DBG(common, "I/O thread pid: %d\n",
+                    task_pid_nr(common->thread_task));
+                wake_up_process(common->thread_task);
         }
 
         fsg->gadget = gadget;