diff options
| author | Felipe Balbi <felipe.balbi@linux.intel.com> | 2017-02-22 17:12:40 +0200 |
|---|---|---|
| committer | Li Jun <jun.li@nxp.com> | 2017-08-29 16:30:46 +0800 |
| commit | 01011b12c5c21164a43bf68e8b1d3dfc758e0743 (patch) | |
| tree | 23b3677b550f7db941759c0a5e850d02ec51bbfb | |
| parent | b0207260e94b9f62886d521d28eb51b89a45ab2d (diff) | |
usb: gadget: g_dnl: only set iSerialNumber if we have a serial#
We don't want to claim that we support a serial number string and
later return nothing. Because of that, if g_dnl_serial is an empty
string, let's skip setting iSerialNumber to a valid number.
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
(cherry picked from commit 842778a091047b0c868efa12229633959f711152)
| -rw-r--r-- | drivers/usb/gadget/g_dnl.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 5bbacdfa41..9e8d76e915 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -224,12 +224,14 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) g_dnl_string_defs[1].id = id; device_desc.iProduct = id; - id = usb_string_id(cdev); - if (id < 0) - return id; + if (strlen(g_dnl_serial)) { + id = usb_string_id(cdev); + if (id < 0) + return id; - g_dnl_string_defs[2].id = id; - device_desc.iSerialNumber = id; + g_dnl_string_defs[2].id = id; + device_desc.iSerialNumber = id; + } g_dnl_bind_fixup(&device_desc, cdev->driver->name); ret = g_dnl_config_register(cdev); |