summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Williams <gwilli@broadcom.com>2013-08-28 16:36:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-07 22:09:59 -0700
commitea599655d74e7b00caf83a0d5c056b00d19d7c2a (patch)
tree910e02aa155e33f42fdca1ebea43b3d892cf2854
parent9c289c0c140b31ce6e3b29898fd1deb80ec04b88 (diff)
downloadkernel-common-ea599655d74e7b00caf83a0d5c056b00d19d7c2a.tar.gz
kernel-common-ea599655d74e7b00caf83a0d5c056b00d19d7c2a.tar.bz2
kernel-common-ea599655d74e7b00caf83a0d5c056b00d19d7c2a.zip
usb: acm gadget: Null termintate strings table
commit d257221854f0b34cca3247e6c45344d0470f7398 upstream. The gadget strings table should be null terminated. usb_gadget_get_string() loops through the table expecting a null at the end of the list. Signed-off-by: Graham Williams <gwilli@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/gadget/f_acm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c
index 4b7e33e5d9c6..ab1065afbbd0 100644
--- a/drivers/usb/gadget/f_acm.c
+++ b/drivers/usb/gadget/f_acm.c
@@ -285,6 +285,7 @@ static struct usb_string acm_string_defs[] = {
[ACM_CTRL_IDX].s = "CDC Abstract Control Model (ACM)",
[ACM_DATA_IDX].s = "CDC ACM Data",
[ACM_IAD_IDX ].s = "CDC Serial",
+ { } /* end of list */
};
static struct usb_gadget_strings acm_string_table = {