summaryrefslogtreecommitdiff
path: root/drivers/usb/misc/iowarrior.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-22 10:00:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-22 10:00:23 +0300
commit6acf116c9558314d3cac36d5eb17f30368c73fd2 (patch)
tree385d0f4811ca8e0bf2deed3d58516b7e97054242 /drivers/usb/misc/iowarrior.c
parent5fcf93795e6b72368cd98cd541b6d4bbe8804320 (diff)
parent08332893e37af6ae779367e78e444f8f9571511d (diff)
downloadlinux-6acf116c9558314d3cac36d5eb17f30368c73fd2.tar.xz
Merge 4.12-rc2 into usb-next
We want the USB fixes in here as well to handle testing and merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc/iowarrior.c')
-rw-r--r--drivers/usb/misc/iowarrior.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index 816afadc4707..7ca4c7e0ea0d 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -549,7 +549,7 @@ static long iowarrior_ioctl(struct file *file, unsigned int cmd,
info.revision = le16_to_cpu(dev->udev->descriptor.bcdDevice);
/* 0==UNKNOWN, 1==LOW(usb1.1) ,2=FULL(usb1.1), 3=HIGH(usb2.0) */
- info.speed = le16_to_cpu(dev->udev->speed);
+ info.speed = dev->udev->speed;
info.if_num = dev->interface->cur_altsetting->desc.bInterfaceNumber;
info.report_size = dev->report_size;