usb: gadget: composite: add iSerialNumber to usb_composite_driver

Add iSerialNumber to usb_composite_driver to allow setting a default value.
This is useful when the module is compiled-in. Then the composite_bind
is executed at kernel boot and string id for iSerialNumber can be overridden
even if there is no iSerialNumber kernel commandline parameter.
If the string id is not overridden, then get_string will never attempt to
look for the alternative string contents using cdev->serial_override.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index df2749052e2c..390749bbb0c3 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -938,7 +938,7 @@ static int get_string(struct usb_composite_dev *cdev,
         else if (cdev->product_override == id)
                 str = iProduct ?: composite->iProduct;
         else if (cdev->serial_override == id)
-                str = iSerialNumber;
+                str = iSerialNumber ?: composite->iSerialNumber;
         else
                 str = NULL;
         if (str) {
@@ -1503,7 +1503,8 @@ static int composite_bind(struct usb_gadget *gadget)
                 cdev->product_override =
                         override_id(cdev, &cdev->desc.iProduct);
 
-        if (iSerialNumber)
+        if (iSerialNumber ||
+            (!cdev->desc.iSerialNumber && composite->iSerialNumber))
                 cdev->serial_override =
                         override_id(cdev, &cdev->desc.iSerialNumber);