1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index 705cc1f76327..e68c00e08765 100644
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -143,7 +143,9 @@ static int msg_thread_exits(struct fsg_common *common)
 
 static int __init msg_do_config(struct usb_configuration *c)
 {
-        struct fsg_common *common;
+        static struct fsg_common common;
+
+        struct fsg_common *retp;
         struct fsg_config config;
         int ret;
 
@@ -154,12 +156,13 @@ static int __init msg_do_config(struct usb_configuration *c)
 
         fsg_config_from_params(&config, &mod_data);
         config.thread_exits = msg_thread_exits;
-        common = fsg_common_init(0, c->cdev, &config);
-        if (IS_ERR(common))
-                return PTR_ERR(common);
 
-        ret = fsg_add(c->cdev, c, common);
-        fsg_common_put(common);
+        retp = fsg_common_init(&common, c->cdev, &config);
+        if (IS_ERR(retp))
+                return PTR_ERR(retp);
+
+        ret = fsg_add(c->cdev, c, &common);
+        fsg_common_put(&common);
         return ret;
 }