patch "USB: misc: iowarrior: add support for 2 OEMed devices" added to usb-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
USB: misc: iowarrior: add support for 2 OEMed devices
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From 461d8deb26a7d70254bc0391feb4fd8a95e674e8 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <[email protected]>
Date: Tue, 11 Feb 2020 20:04:21 -0800
Subject: USB: misc: iowarrior: add support for 2 OEMed devices
Add support for two OEM devices that are identical to existing IO-Warrior devices, except for the USB device id.
--- drivers/usb/misc/iowarrior.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/usb/misc/iowarrior.c +13 -2
@@ -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
@@ -133,6 +137,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);
@@ -357,6 +363,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 :
@@ -371,6 +378,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 */
@@ -493,6 +501,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 ) {
@@ -767,7 +776,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) {
@@ -780,7 +790,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 ;
Signature · 1 line
2.25.0