summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorScot Doyle <lkml14@scotdoyle.com>2014-09-25 15:16:48 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-28 21:54:26 -0400
commit586af079386fc78719314800bb7741d736cd442f (patch)
tree8b999b45b3659f2c99841dc71f96ff2228e8203d /drivers/usb
parent0cfbd328d60f85b0dcf66df61a3615e9a8e5d4e4 (diff)
usb: core: log higher level message on malformed LANGID descriptor
Commit 0cce2eda19923e5e5ccc8b042dec5af87b3ffad0 USB: fix LANGID=0 regression defaults to a langid of 0x0409 if it's not properly implemented by the device. Explain with a higher level error message what this means. Signed-off-by: Scot Doyle <lkml14@scotdoyle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/message.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 0c8a7fc4dad8..f7b7713cfb2a 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -770,9 +770,7 @@ static int usb_get_langid(struct usb_device *dev, unsigned char *tbuf)
dev->string_langid = 0x0409;
dev->have_langid = 1;
dev_err(&dev->dev,
- "string descriptor 0 malformed (err = %d), "
- "defaulting to 0x%04x\n",
- err, dev->string_langid);
+ "language id specifier not provided by device, defaulting to English\n");
return 0;
}