1 files changed, 4 insertions, 18 deletions

diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 098c3d03dedd..9962504e14f1 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -175,26 +175,12 @@ static int __init gs_bind(struct usb_composite_dev *cdev)
         snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",
                 init_utsname()->sysname, init_utsname()->release,
                 gadget->name);
-        status = usb_string_id(cdev);
+        status = usb_string_ids_tab(cdev, strings_dev);
         if (status < 0)
                 goto fail;
-        strings_dev[STRING_MANUFACTURER_IDX].id = status;
-
-        device_desc.iManufacturer = status;
-
-        status = usb_string_id(cdev);
-        if (status < 0)
-                goto fail;
-        strings_dev[STRING_PRODUCT_IDX].id = status;
-
-        device_desc.iProduct = status;
-
-        /* config description */
-        status = usb_string_id(cdev);
-        if (status < 0)
-                goto fail;
-        strings_dev[STRING_DESCRIPTION_IDX].id = status;
-
+        device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;
+        device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;
+        status = strings_dev[STRING_DESCRIPTION_IDX].id;
         serial_config_driver.iConfiguration = status;
 
         /* set up other descriptors */