Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-01-18 07:53:27 +0100
committerJiri Slaby <jslaby@suse.cz>2019-01-18 07:53:34 +0100
commit682a902c485523f788696123ade67c88f4345dc6 (patch)
tree7cd14f384e96083df4c8917fb3926afd4153de96
parent252a855263b29b9e485dbb91d54a1abf90be8fbd (diff)
usb: cdc-acm: send ZLP for Telit 3G Intel based modems
-rw-r--r--patches.kernel.org/4.20.3-023-usb-cdc-acm-send-ZLP-for-Telit-3G-Intel-based-.patch41
-rw-r--r--series.conf1
2 files changed, 42 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.3-023-usb-cdc-acm-send-ZLP-for-Telit-3G-Intel-based-.patch b/patches.kernel.org/4.20.3-023-usb-cdc-acm-send-ZLP-for-Telit-3G-Intel-based-.patch
new file mode 100644
index 0000000000..43e63364db
--- /dev/null
+++ b/patches.kernel.org/4.20.3-023-usb-cdc-acm-send-ZLP-for-Telit-3G-Intel-based-.patch
@@ -0,0 +1,41 @@
+From: Daniele Palmas <dnlplm@gmail.com>
+Date: Fri, 28 Dec 2018 16:15:41 +0100
+Subject: [PATCH] usb: cdc-acm: send ZLP for Telit 3G Intel based modems
+References: bnc#1012628
+Patch-mainline: 4.20.3
+Git-commit: 34aabf918717dd14e05051896aaecd3b16b53d95
+
+commit 34aabf918717dd14e05051896aaecd3b16b53d95 upstream.
+
+Telit 3G Intel based modems require zero packet to be sent if
+out data size is equal to the endpoint max packet size.
+
+Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/usb/class/cdc-acm.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
+index ed8c62b2d9d1..739f8960811a 100644
+--- a/drivers/usb/class/cdc-acm.c
++++ b/drivers/usb/class/cdc-acm.c
+@@ -1865,6 +1865,13 @@ static const struct usb_device_id acm_ids[] = {
+ .driver_info = IGNORE_DEVICE,
+ },
+
++ { USB_DEVICE(0x1bc7, 0x0021), /* Telit 3G ACM only composition */
++ .driver_info = SEND_ZERO_PACKET,
++ },
++ { USB_DEVICE(0x1bc7, 0x0023), /* Telit 3G ACM + ECM composition */
++ .driver_info = SEND_ZERO_PACKET,
++ },
++
+ /* control interfaces without any protocol set */
+ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
+ USB_CDC_PROTO_NONE) },
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 369debfbfc..bbba5d8f74 100644
--- a/series.conf
+++ b/series.conf
@@ -260,6 +260,7 @@
patches.kernel.org/4.20.3-020-ARM-davinci-omapl138-hawk-fix-label-names-in-G.patch
patches.kernel.org/4.20.3-021-ARM-davinci-dm644x-evm-fix-label-names-in-GPIO.patch
patches.kernel.org/4.20.3-022-ARM-davinci-da830-evm-fix-label-names-in-GPIO-.patch
+ patches.kernel.org/4.20.3-023-usb-cdc-acm-send-ZLP-for-Telit-3G-Intel-based-.patch
########################################################
# Build fixes that apply to the vanilla kernel too.