1 files changed, 19 insertions, 10 deletions

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 6a67e2ed75d9..93a26b365e6a 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -2980,11 +2980,27 @@ fail:
         return rc;
 }
 
+void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn,
+                                   const char *pn)
+{
+        int i;
+
+        /* Prepare inquiryString */
+        i = get_default_bcdDevice();
+        snprintf(common->inquiry_string, sizeof(common->inquiry_string),
+                 "%-8s%-16s%04x", vn ?: "Linux",
+                 /* Assume product name dependent on the first LUN */
+                 pn ?: ((*common->luns)->cdrom
+                     ? "File-CD Gadget"
+                     : "File-Stor Gadget"),
+                 i);
+}
+
 struct fsg_common *fsg_common_init(struct fsg_common *common,
                                    struct usb_composite_dev *cdev,
                                    struct fsg_config *cfg)
 {
-        int i, rc;
+        int rc;
 
         common = fsg_common_setup(common);
         if (IS_ERR(common))
@@ -3013,16 +3029,9 @@ struct fsg_common *fsg_common_init(struct fsg_common *common,
         if (rc)
                 goto error_release;
 
-        /* Prepare inquiryString */
-        i = get_default_bcdDevice();
-        snprintf(common->inquiry_string, sizeof common->inquiry_string,
-                 "%-8s%-16s%04x", cfg->vendor_name ?: "Linux",
-                 /* Assume product name dependent on the first LUN */
-                 cfg->product_name ?: ((*common->luns)->cdrom
-                                     ? "File-CD Gadget"
-                                     : "File-Stor Gadget"),
-                 i);
 
+        fsg_common_set_inquiry_string(common, cfg->vendor_name,
+                                      cfg->product_name);
         /* Tell the thread to start working */
         common->thread_task =
                 kthread_create(fsg_main_thread, common, "file-storage");