From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Date: Fri, 18 Apr 2014 08:54:28 -0500 Subject: [U-Boot] [PATCH v4 1/5] usb: handle NULL table in usb_gadget_get_string In-Reply-To: <1397829272-22266-1-git-send-email-robherring2@gmail.com> References: <1397157488-8695-1-git-send-email-robherring2@gmail.com> <1397829272-22266-1-git-send-email-robherring2@gmail.com> Message-ID: <1397829272-22266-2-git-send-email-robherring2@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Rob Herring Allow a NULL table to be passed to usb_gadget_get_string for cases when a string table may not be populated. Signed-off-by: Rob Herring Reviewed-by: Tom Rini Acked-by: Marek Vasut Acked-by: Lukasz Majewski --- drivers/usb/gadget/usbstring.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c index de5fa3f..8c3ff64 100644 --- a/drivers/usb/gadget/usbstring.c +++ b/drivers/usb/gadget/usbstring.c @@ -108,6 +108,9 @@ usb_gadget_get_string(struct usb_gadget_strings *table, int id, u8 *buf) struct usb_string *s; int len; + if (!table) + return -EINVAL; + /* descriptor 0 has the language id */ if (id == 0) { buf[0] = 4; -- 1.9.1