From 52978aae0cba8e724b4c71f45b81f90f6edea3a7 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 18 Jun 2017 21:05:59 +0100 Subject: [PATCH] USB: serial: option: add two Longcheer device ids (Closes: #864604) --- debian/changelog | 1 + ...-option-add-two-longcheer-device-ids.patch | 37 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 39 insertions(+) create mode 100644 debian/patches/features/all/usb-serial-option-add-two-longcheer-device-ids.patch diff --git a/debian/changelog b/debian/changelog index 5c9dc6833..b31650b89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ linux (4.11.6-1) UNRELEASED; urgency=medium (Closes: #862842) * [rt] Update to 4.11.5-rt1 and reenable * fs: Reenable HPFS_FS as module (Closes: #864878) + * USB: serial: option: add two Longcheer device ids (Closes: #864604) -- Ben Hutchings Tue, 06 Jun 2017 20:43:11 +0100 diff --git a/debian/patches/features/all/usb-serial-option-add-two-longcheer-device-ids.patch b/debian/patches/features/all/usb-serial-option-add-two-longcheer-device-ids.patch new file mode 100644 index 000000000..cd217da02 --- /dev/null +++ b/debian/patches/features/all/usb-serial-option-add-two-longcheer-device-ids.patch @@ -0,0 +1,37 @@ +From: Johan Hovold +Date: Mon, 12 Jun 2017 16:30:16 +0200 +Subject: USB: serial: option: add two Longcheer device ids +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Origin: https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/commit?id=8fb060da715ad10fe956d7c0077b2fb0c12bb9d7 +Bug-Debian: https://bugs.debian.org/864604 + +Add two Longcheer device-id entries which specifically enables a +Telewell TW-3G HSPA+ branded modem (0x9801). + +Reported-by: Teemu Likonen +Reported-by: Bjørn Mork +Reported-by: Lars Melin +Tested-by: Teemu Likonen +Cc: stable +Signed-off-by: Johan Hovold +--- + drivers/usb/serial/option.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c +index 3bf61acfc26b..ebe51f11105d 100644 +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -1877,6 +1877,10 @@ static const struct usb_device_id option_ids[] = { + .driver_info = (kernel_ulong_t)&four_g_w100_blacklist + }, + { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) }, ++ { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, ++ { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9803, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) }, + { USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) }, + { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) }, diff --git a/debian/patches/series b/debian/patches/series index 7055681c2..76b8aa449 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -69,6 +69,7 @@ bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch # Miscellaneous features +features/all/usb-serial-option-add-two-longcheer-device-ids.patch # Lockdown (formerly 'securelevel') patchset features/all/lockdown/0001-Annotate-module-params-that-specify-hardware-paramet.patch