[PATCH v2] usb: core: downgrade log severity to info when descriptor unavailable

From: Scot Doyle
Date: Tue Sep 23 2014 - 15:13:11 EST


According to commit 0cce2eda19923e5e5ccc8b042dec5af87b3ffad0
USB: fix LANGID=0 regression

usb devices are not required to report string descriptors. Since they are
optional, log an info message instead of an error message.

Signed-off-by: Scot Doyle <lkml14@xxxxxxxxxxxxx>
---
drivers/usb/core/message.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 0c8a7fc..da2f1f2 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -780,8 +780,12 @@ static int usb_get_langid(struct usb_device *dev, unsigned char *tbuf)
* deal with strings at all. Set string_langid to -1 in order to
* prevent any string to be retrieved from the device */
if (err < 0) {
- dev_err(&dev->dev, "string descriptor 0 read error: %d\n",
- err);
+ if (err == -EPIPE)
+ dev_info(&dev->dev,
+ "string descriptor 0 read error: -EPIPE\n");
+ else
+ dev_err(&dev->dev,
+ "string descriptor 0 read error: %d\n", err);
dev->string_langid = -1;
return -EPIPE;
}
--
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/