diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-18 23:33:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-18 23:33:01 -0400 |
commit | bd479f293370d863953aba59130bcc7ae867dd10 (patch) | |
tree | b6987c9c622d1f98b680d6fce1447972d717761c /drivers/usb/misc/adutux.c | |
parent | 68c91d377c9bd14cbe35c647ed3b847f7862c958 (diff) | |
parent | b36f4be3de1b123d8601de062e7dbfc904f305fb (diff) |
Merge 3.11-rc6 into usb-next
We want these USB fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc/adutux.c')
-rw-r--r-- | drivers/usb/misc/adutux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index 7078e9bf0fc0..3eaa83f05086 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c | |||
@@ -783,7 +783,7 @@ static int adu_probe(struct usb_interface *interface, | |||
783 | 783 | ||
784 | /* let the user know what node this device is now attached to */ | 784 | /* let the user know what node this device is now attached to */ |
785 | dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d\n", | 785 | dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d\n", |
786 | udev->descriptor.idProduct, dev->serial_number, | 786 | le16_to_cpu(udev->descriptor.idProduct), dev->serial_number, |
787 | (dev->minor - ADU_MINOR_BASE)); | 787 | (dev->minor - ADU_MINOR_BASE)); |
788 | exit: | 788 | exit: |
789 | return retval; | 789 | return retval; |