| From 11a225efdb447f1a9dc594cdfb5c8f8d8dc52f1a Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Tue, 11 Feb 2020 20:04:21 -0800 |
| Subject: [PATCH] USB: misc: iowarrior: add support for 2 OEMed devices |
| |
| commit 461d8deb26a7d70254bc0391feb4fd8a95e674e8 upstream. |
| |
| Add support for two OEM devices that are identical to existing |
| IO-Warrior devices, except for the USB device id. |
| |
| Cc: Christoph Jung <jung@codemercs.com> |
| Cc: stable <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20200212040422.2991-1-gregkh@linuxfoundation.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c |
| index f405fa734bcc..b686969d704e 100644 |
| --- a/drivers/usb/misc/iowarrior.c |
| +++ b/drivers/usb/misc/iowarrior.c |
| @@ -34,6 +34,10 @@ |
| /* full speed iowarrior */ |
| #define USB_DEVICE_ID_CODEMERCS_IOW56 0x1503 |
| |
| +/* OEMed devices */ |
| +#define USB_DEVICE_ID_CODEMERCS_IOW24SAG 0x158a |
| +#define USB_DEVICE_ID_CODEMERCS_IOW56AM 0x158b |
| + |
| /* Get a minor range for your devices from the usb maintainer */ |
| #ifdef CONFIG_USB_DYNAMIC_MINORS |
| #define IOWARRIOR_MINOR_BASE 0 |
| @@ -137,6 +141,8 @@ static const struct usb_device_id iowarrior_ids[] = { |
| {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOWPV1)}, |
| {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOWPV2)}, |
| {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW56)}, |
| + {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW24SAG)}, |
| + {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW56AM)}, |
| {} /* Terminating entry */ |
| }; |
| MODULE_DEVICE_TABLE(usb, iowarrior_ids); |
| @@ -361,6 +367,7 @@ static ssize_t iowarrior_write(struct file *file, |
| } |
| switch (dev->product_id) { |
| case USB_DEVICE_ID_CODEMERCS_IOW24: |
| + case USB_DEVICE_ID_CODEMERCS_IOW24SAG: |
| case USB_DEVICE_ID_CODEMERCS_IOWPV1: |
| case USB_DEVICE_ID_CODEMERCS_IOWPV2: |
| case USB_DEVICE_ID_CODEMERCS_IOW40: |
| @@ -375,6 +382,7 @@ static ssize_t iowarrior_write(struct file *file, |
| goto exit; |
| break; |
| case USB_DEVICE_ID_CODEMERCS_IOW56: |
| + case USB_DEVICE_ID_CODEMERCS_IOW56AM: |
| /* The IOW56 uses asynchronous IO and more urbs */ |
| if (atomic_read(&dev->write_busy) == MAX_WRITES_IN_FLIGHT) { |
| /* Wait until we are below the limit for submitted urbs */ |
| @@ -499,6 +507,7 @@ static long iowarrior_ioctl(struct file *file, unsigned int cmd, |
| switch (cmd) { |
| case IOW_WRITE: |
| if (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW24 || |
| + dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW24SAG || |
| dev->product_id == USB_DEVICE_ID_CODEMERCS_IOWPV1 || |
| dev->product_id == USB_DEVICE_ID_CODEMERCS_IOWPV2 || |
| dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW40) { |
| @@ -782,7 +791,8 @@ static int iowarrior_probe(struct usb_interface *interface, |
| goto error; |
| } |
| |
| - if (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56) { |
| + if ((dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56) || |
| + (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56AM)) { |
| res = usb_find_last_int_out_endpoint(iface_desc, |
| &dev->int_out_endpoint); |
| if (res) { |
| @@ -795,7 +805,8 @@ static int iowarrior_probe(struct usb_interface *interface, |
| /* we have to check the report_size often, so remember it in the endianness suitable for our machine */ |
| dev->report_size = usb_endpoint_maxp(dev->int_in_endpoint); |
| if ((dev->interface->cur_altsetting->desc.bInterfaceNumber == 0) && |
| - (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56)) |
| + ((dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56) || |
| + (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56AM))) |
| /* IOWarrior56 has wMaxPacketSize different from report size */ |
| dev->report_size = 7; |
| |
| -- |
| 2.7.4 |
| |
