aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/core/message.c2
-rw-r--r--include/linux/usb.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 7729c0744886..5684d8722922 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -764,7 +764,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
764 err = -EINVAL; 764 err = -EINVAL;
765 goto errout; 765 goto errout;
766 } else { 766 } else {
767 dev->have_langid = -1; 767 dev->have_langid = 1;
768 dev->string_langid = tbuf[2] | (tbuf[3]<< 8); 768 dev->string_langid = tbuf[2] | (tbuf[3]<< 8);
769 /* always use the first langid listed */ 769 /* always use the first langid listed */
770 dev_dbg (&dev->dev, "default language 0x%04x\n", 770 dev_dbg (&dev->dev, "default language 0x%04x\n",
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 864c6c21c21e..5634a2d91ec0 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -362,7 +362,7 @@ struct usb_device {
362 u8 portnum; /* Parent port number (origin 1) */ 362 u8 portnum; /* Parent port number (origin 1) */
363 u8 level; /* Number of USB hub ancestors */ 363 u8 level; /* Number of USB hub ancestors */
364 364
365 int have_langid; /* whether string_langid is valid */ 365 unsigned have_langid:1; /* whether string_langid is valid */
366 int string_langid; /* language ID for strings */ 366 int string_langid; /* language ID for strings */
367 367
368 /* static strings from the device */ 368 /* static strings from the device */