summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBenson Leung <bleung@chromium.org>2018-03-24 10:40:27 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-25 12:50:44 +0200
commit73c6d3b284cf7b31c03fdaa2476f48f8da0932f8 (patch)
tree29f16bbe9d9870a650a014fdb9c26014902a62a6 /drivers
parent64627388b50158fd24d6ad88132525b95a5ef573 (diff)
downloadlinux-stable-73c6d3b284cf7b31c03fdaa2476f48f8da0932f8.tar.gz
linux-stable-73c6d3b284cf7b31c03fdaa2476f48f8da0932f8.tar.bz2
linux-stable-73c6d3b284cf7b31c03fdaa2476f48f8da0932f8.zip
USB: announce bcdDevice as well as idVendor, idProduct.
Print bcdDevice which is used by vendors to identify different versions of the same product (or different versions of firmware). Adding this to the logs will be useful for support purposes. Match the %2x.%02x formatting that's used by lsusb -v for this same value. Signed-off-by: Benson Leung <bleung@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/core/hub.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 793eda1cfe49..f6ea16e9f6bb 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2192,9 +2192,13 @@ static void show_string(struct usb_device *udev, char *id, char *string)
static void announce_device(struct usb_device *udev)
{
- dev_info(&udev->dev, "New USB device found, idVendor=%04x, idProduct=%04x\n",
+ u16 bcdDevice = le16_to_cpu(udev->descriptor.bcdDevice);
+
+ dev_info(&udev->dev,
+ "New USB device found, idVendor=%04x, idProduct=%04x, bcdDevice=%2x.%02x\n",
le16_to_cpu(udev->descriptor.idVendor),
- le16_to_cpu(udev->descriptor.idProduct));
+ le16_to_cpu(udev->descriptor.idProduct),
+ bcdDevice >> 8, bcdDevice & 0xff);
dev_info(&udev->dev,
"New USB device strings: Mfr=%d, Product=%d, SerialNumber=%d\n",
udev->descriptor.iManufacturer,