From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754849AbaIWTNG (ORCPT ); Tue, 23 Sep 2014 15:13:06 -0400 Received: from mx1.scotdoyle.com ([23.226.141.211]:47038 "EHLO mx1.scotdoyle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751746AbaIWTNF (ORCPT ); Tue, 23 Sep 2014 15:13:05 -0400 Date: Tue, 23 Sep 2014 19:12:40 +0000 (UTC) From: Scot Doyle To: Alan Stern , Greg Kroah-Hartman , Sarah Sharp , Dan Williams cc: Daniel Mack , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] usb: core: downgrade log severity to info when descriptor unavailable In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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