summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Williams <gwilli@broadcom.com>2013-08-29 01:36:14 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-30 20:10:36 +0200
commitd257221854f0b34cca3247e6c45344d0470f7398 (patch)
treeb9886ffc67bc56d06a05abe9dd5d2de570d1e607
parentdma: cppi41: off by one in desc_to_chan() (diff)
downloadlinux-d257221854f0b34cca3247e6c45344d0470f7398.tar.xz
linux-d257221854f0b34cca3247e6c45344d0470f7398.zip
usb: acm gadget: Null termintate strings table
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> Cc: stable <stable@vger.kernel.org> 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 = {