52a82ce3dd
This just copies the files from the kernel 4.14 specific folders into the kernel 4.19 specific folder, no changes are done to the files in this commit. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From 4d304a6fe93538ce356b4593dc43476b50c023e7 Mon Sep 17 00:00:00 2001
|
|
From: Giuseppe Lippolis <giu.lippolis@gmail.com>
|
|
Date: Mon, 23 Apr 2018 09:03:06 +0200
|
|
Subject: USB: serial: option: blacklist unused dwm-158 interfaces
|
|
|
|
The dwm-158 interface 4 and 5 doesn't answer to the AT commands
|
|
and doesn't appears a option interface.
|
|
Tested on openwrt distribution (kernel 4.14 using the old blacklist
|
|
definitions).
|
|
|
|
Lars Melin also writes:
|
|
|
|
Blacklisting interface 4 and 5 is correct because:
|
|
|
|
MI_00 D-Link Mobile Broadband Device (cdc_ether)
|
|
MI_02 D-Link HSPA+DataCard Diagnostics Interface (also ppp modem)
|
|
MI_03 D-Link HSPA+DataCard NMEA Device
|
|
MI_04 D-Link HSPA+DataCard Speech Port
|
|
MI_05 D-Link HSPA+DataCard Debug Port
|
|
MI_06 USB Mass Storage Device
|
|
|
|
Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>
|
|
[ johan: add Lars's comment on the interface layout and reword summary ]
|
|
Cc: Lars Melin <larsm17@gmail.com>
|
|
Cc: Dan Williams <dcbw@redhat.com>
|
|
Signed-off-by: Johan Hovold <johan@kernel.org>
|
|
---
|
|
drivers/usb/serial/option.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/usb/serial/option.c
|
|
+++ b/drivers/usb/serial/option.c
|
|
@@ -1927,7 +1927,8 @@ static const struct usb_device_id option
|
|
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */
|
|
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
|
|
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },
|
|
- { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) }, /* D-Link DWM-158 */
|
|
+ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff), /* D-Link DWM-158 */
|
|
+ .driver_info = RSVD(4) | RSVD(5) },
|
|
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d0e, 0xff) }, /* D-Link DWM-157 C1 */
|
|
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link DWM-221 B1 */
|
|
.driver_info = RSVD(4) },
|