From: Seung-Woo Kim Date: Wed, 19 Apr 2017 01:00:36 +0000 (+0900) Subject: usb: gadget: slp: fix to use serial number of dmi X-Git-Tag: submit/tizen/20170703.020614~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48713455056c3dba3c2f609ce12f7cdc3de15bf9;p=platform%2Fkernel%2Flinux-exynos.git usb: gadget: slp: fix to use serial number of dmi For identical serial string of slp gadget, this patch fixes to use product serial of dmi if the dmi value is set. Change-Id: Ic75f6c7730cba5860afdf3bd60babc754b3ecd67 Signed-off-by: Seung-Woo Kim --- diff --git a/drivers/usb/gadget/legacy/slp.c b/drivers/usb/gadget/legacy/slp.c index 71246ef48fe8..f61ea943961e 100644 --- a/drivers/usb/gadget/legacy/slp.c +++ b/drivers/usb/gadget/legacy/slp.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -1166,6 +1167,7 @@ static int slp_multi_bind(struct usb_composite_dev *cdev) { struct slp_multi_dev *dev = _slp_multi_dev; struct usb_gadget *gadget = cdev->gadget; + const char *serial; int id, ret; /* @@ -1196,7 +1198,12 @@ static int slp_multi_bind(struct usb_composite_dev *cdev) /* Default strings - should be updated by userspace */ strncpy(manufacturer_string, "Samsung", sizeof(manufacturer_string)-1); strncpy(product_string, "TIZEN", sizeof(product_string) - 1); - snprintf(serial_string, 18, "%s", "01234TEST"); + + serial = dmi_get_system_info(DMI_PRODUCT_SERIAL); + if (serial) + snprintf(serial_string, 18, "%s", serial); + else + snprintf(serial_string, 18, "%s", "01234TEST"); id = usb_string_id(cdev); if (id < 0)