[linux] 02/03: USB: serial: option: add two Longcheer device ids (Closes: #864604)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 52978aae0cba8e724b4c71f45b81f90f6edea3a7
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jun 18 21:05:59 2017 +0100

    USB: serial: option: add two Longcheer device ids (Closes: #864604)
---
 debian/changelog                                   |  1 +
 ...erial-option-add-two-longcheer-device-ids.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5c9dc68..b31650b 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 <ben at decadent.org.uk>  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 0000000..cd217da
--- /dev/null
+++ b/debian/patches/features/all/usb-serial-option-add-two-longcheer-device-ids.patch
@@ -0,0 +1,37 @@
+From: Johan Hovold <johan at kernel.org>
+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 <tlikonen at iki.fi>
+Reported-by: Bjørn Mork <bjorn at mork.no>
+Reported-by: Lars Melin <larsm17 at gmail.com>
+Tested-by: Teemu Likonen <tlikonen at iki.fi>
+Cc: stable <stable at vger.kernel.org>
+Signed-off-by: Johan Hovold <johan at kernel.org>
+---
+ 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 7055681..76b8aa4 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git