From: Felipe Balbi <felipe.balbi@linux.intel.com>
Date: Wed, 22 Feb 2017 15:12:40 +0000 (+0200)
Subject: usb: gadget: g_dnl: only set iSerialNumber if we have a serial#
X-Git-Tag: v2017.05-rc2~5^2~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=842778a09104;p=u-boot

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>
---

diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index fcedb554c4..4cc4438fdb 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);