usb: core: log higher level message on malformed LANGID descriptor
authorScot Doyle <lkml14@scotdoyle.com>
Thu, 25 Sep 2014 15:16:48 +0000 (15:16 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Sep 2014 01:54:26 +0000 (21:54 -0400)
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>
drivers/usb/core/message.c

index 0c8a7fc..f7b7713 100644 (file)
@@ -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;
        }