commit 107df571f5ddfb885676eaf5b73ea099760857ae
author Linux Build Service Account <lnxbuild@localhost> Wed May 06 13:42:57 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed May 06 13:42:57 2020 -0700
tree 72140d54ac2a3679adf1667d30ddbb9064ed339a
parent c6faf952b1f02f0173b0abe27e0273bda56f3354
parent 618b797533ca9a6f2cc4439bd69c2e8fd6fc7a74

Merge "USB: gadget: qti: Fix NULL check for usb_pid_string"

drivers/usb/gadget/legacy/qti_gadget.c

diff --git a/drivers/usb/gadget/legacy/qti_gadget.c b/drivers/usb/gadget/legacy/qti_gadget.c
index 77b458a..972168c 100644
--- a/drivers/usb/gadget/legacy/qti_gadget.c
+++ b/drivers/usb/gadget/legacy/qti_gadget.c
@@ -497,7 +497,7 @@
 		gadget->cdev.desc.bDeviceProtocol = (u8)val;
 
 	/* Check if pid passed via cmdline which takes precedence */
-	if (usb_pid_string != NULL) {
+	if (usb_pid_string[0] != 0) {
 		ret = kstrtoint(usb_pid_string, 16, &val);
 		if (ret)
 			return ret;