From b7e30fe88f85bc39ea599dee4ddf23f97d1ceacb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 2 Oct 2014 15:20:52 -0700 Subject: [PATCH] 3.10-stable patches added patches: usb-ftdi_sio-add-support-for-novitus-bono-e-thermal-printer.patch usb-sierra-add-1199-68aa-device-id.patch usb-sierra-avoid-cdc-class-functions-on-68a3-devices.patch --- queue-3.10/series | 3 ++ ...t-for-novitus-bono-e-thermal-printer.patch | 45 ++++++++++++++++ .../usb-sierra-add-1199-68aa-device-id.patch | 36 +++++++++++++ ...-cdc-class-functions-on-68a3-devices.patch | 53 +++++++++++++++++++ 4 files changed, 137 insertions(+) create mode 100644 queue-3.10/usb-ftdi_sio-add-support-for-novitus-bono-e-thermal-printer.patch create mode 100644 queue-3.10/usb-sierra-add-1199-68aa-device-id.patch create mode 100644 queue-3.10/usb-sierra-avoid-cdc-class-functions-on-68a3-devices.patch diff --git a/queue-3.10/series b/queue-3.10/series index 0f7f74f2b34..69000201b55 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -45,3 +45,6 @@ usb-option-add-via-telecom-cds7-chipset-device-id.patch revert-usb-option-zte_ev-move-most-zte-cdma-devices-to-zte_ev.patch usb-zte_ev-remove-duplicate-gobi-pid.patch usb-zte_ev-remove-duplicate-qualcom-pid.patch +usb-sierra-avoid-cdc-class-functions-on-68a3-devices.patch +usb-sierra-add-1199-68aa-device-id.patch +usb-ftdi_sio-add-support-for-novitus-bono-e-thermal-printer.patch diff --git a/queue-3.10/usb-ftdi_sio-add-support-for-novitus-bono-e-thermal-printer.patch b/queue-3.10/usb-ftdi_sio-add-support-for-novitus-bono-e-thermal-printer.patch new file mode 100644 index 00000000000..d0b90cad0f6 --- /dev/null +++ b/queue-3.10/usb-ftdi_sio-add-support-for-novitus-bono-e-thermal-printer.patch @@ -0,0 +1,45 @@ +From ee444609dbae8afee420c3243ce4c5f442efb622 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Mon, 18 Aug 2014 18:33:11 +0200 +Subject: USB: ftdi_sio: add support for NOVITUS Bono E thermal printer + +From: Johan Hovold + +commit ee444609dbae8afee420c3243ce4c5f442efb622 upstream. + +Add device id for NOVITUS Bono E thermal printer. + +Reported-by: Emanuel Koczwara +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ + 2 files changed, 7 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -744,6 +744,7 @@ static struct usb_device_id id_table_com + { USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID), + .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk }, + { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, ++ { USB_DEVICE(NOVITUS_VID, NOVITUS_BONO_E_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_S03_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_59_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_57A_PID) }, +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -837,6 +837,12 @@ + #define TELLDUS_TELLSTICK_PID 0x0C30 /* RF control dongle 433 MHz using FT232RL */ + + /* ++ * NOVITUS printers ++ */ ++#define NOVITUS_VID 0x1a28 ++#define NOVITUS_BONO_E_PID 0x6010 ++ ++/* + * RT Systems programming cables for various ham radios + */ + #define RTSYSTEMS_VID 0x2100 /* Vendor ID */ diff --git a/queue-3.10/usb-sierra-add-1199-68aa-device-id.patch b/queue-3.10/usb-sierra-add-1199-68aa-device-id.patch new file mode 100644 index 00000000000..7c60def24ee --- /dev/null +++ b/queue-3.10/usb-sierra-add-1199-68aa-device-id.patch @@ -0,0 +1,36 @@ +From 5b3da69285c143b7ea76b3b9f73099ff1093ab73 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= +Date: Thu, 28 Aug 2014 15:08:16 +0200 +Subject: USB: sierra: add 1199:68AA device ID +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= + +commit 5b3da69285c143b7ea76b3b9f73099ff1093ab73 upstream. + +This VID:PID is used for some Direct IP devices behaving +identical to the already supported 0F3D:68AA devices. + +Reported-by: Lars Melin +Signed-off-by: Bjørn Mork +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/sierra.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/usb/serial/sierra.c ++++ b/drivers/usb/serial/sierra.c +@@ -286,6 +286,9 @@ static const struct usb_device_id id_tab + { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68A3, 0xFF, 0xFF, 0xFF), + .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist + }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68AA, 0xFF, 0xFF, 0xFF), ++ .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist ++ }, + /* AT&T Direct IP LTE modems */ + { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF), + .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist diff --git a/queue-3.10/usb-sierra-avoid-cdc-class-functions-on-68a3-devices.patch b/queue-3.10/usb-sierra-avoid-cdc-class-functions-on-68a3-devices.patch new file mode 100644 index 00000000000..c5d807471fc --- /dev/null +++ b/queue-3.10/usb-sierra-avoid-cdc-class-functions-on-68a3-devices.patch @@ -0,0 +1,53 @@ +From 049255f51644c1105775af228396d187402a5934 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= +Date: Thu, 28 Aug 2014 14:11:23 +0200 +Subject: USB: sierra: avoid CDC class functions on "68A3" devices +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= + +commit 049255f51644c1105775af228396d187402a5934 upstream. + +Sierra Wireless Direct IP devices using the 68A3 product ID +can be configured for modes including a CDC ECM class function. +The known example uses interface numbers 12 and 13 for the ECM +control and data interfaces respectively, consistent with CDC +MBIM function interface numbering on other Sierra devices. + +It seems cleaner to restrict this driver to the ff/ff/ff +vendor specific interfaces rather than increasing the already +long interface number blacklist. This should be more future +proof if Sierra adds more class functions using interface +numbers not yet in the blacklist. + +Signed-off-by: Bjørn Mork +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/sierra.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/usb/serial/sierra.c ++++ b/drivers/usb/serial/sierra.c +@@ -282,14 +282,16 @@ static const struct usb_device_id id_tab + /* Sierra Wireless HSPA Non-Composite Device */ + { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)}, + { USB_DEVICE(0x1199, 0x6893) }, /* Sierra Wireless Device */ +- { USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless Direct IP modems */ ++ /* Sierra Wireless Direct IP modems */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68A3, 0xFF, 0xFF, 0xFF), + .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist + }, + /* AT&T Direct IP LTE modems */ + { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF), + .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist + }, +- { USB_DEVICE(0x0f3d, 0x68A3), /* Airprime/Sierra Wireless Direct IP modems */ ++ /* Airprime/Sierra Wireless Direct IP modems */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68A3, 0xFF, 0xFF, 0xFF), + .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist + }, + -- 2.47.3