aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/option.c
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2018-03-07 05:49:55 -0500
committerJohan Hovold <johan@kernel.org>2018-03-19 07:20:11 -0400
commita0bf2ef9783d55f60bac1492f225c3a4fe2b363c (patch)
tree7c561f6b41da5c54580477e2b82b0f1d8f251ba8 /drivers/usb/serial/option.c
parentc3a65808f04a8426481b63a4fbd9392f009f6330 (diff)
USB: serial: option: drop redundant interface-class test
Drop redundant interface-class test for Samsung GT-B3730 modems for which we only match and probe the CDC data interface. Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/option.c')
-rw-r--r--drivers/usb/serial/option.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index b331baec3a0b..1f5145d714d6 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1975,7 +1975,6 @@ static int option_probe(struct usb_serial *serial,
1975{ 1975{
1976 struct usb_interface_descriptor *iface_desc = 1976 struct usb_interface_descriptor *iface_desc =
1977 &serial->interface->cur_altsetting->desc; 1977 &serial->interface->cur_altsetting->desc;
1978 struct usb_device_descriptor *dev_desc = &serial->dev->descriptor;
1979 unsigned long device_flags = id->driver_info; 1978 unsigned long device_flags = id->driver_info;
1980 1979
1981 /* Never bind to the CD-Rom emulation interface */ 1980 /* Never bind to the CD-Rom emulation interface */
@@ -1989,14 +1988,6 @@ static int option_probe(struct usb_serial *serial,
1989 */ 1988 */
1990 if (device_flags & RSVD(iface_desc->bInterfaceNumber)) 1989 if (device_flags & RSVD(iface_desc->bInterfaceNumber))
1991 return -ENODEV; 1990 return -ENODEV;
1992 /*
1993 * Don't bind network interface on Samsung GT-B3730, it is handled by
1994 * a separate module.
1995 */
1996 if (dev_desc->idVendor == cpu_to_le16(SAMSUNG_VENDOR_ID) &&
1997 dev_desc->idProduct == cpu_to_le16(SAMSUNG_PRODUCT_GT_B3730) &&
1998 iface_desc->bInterfaceClass != USB_CLASS_CDC_DATA)
1999 return -ENODEV;
2000 1991
2001 /* Store the device flags so we can use them during attach. */ 1992 /* Store the device flags so we can use them during attach. */
2002 usb_set_serial_data(serial, (void *)device_flags); 1993 usb_set_serial_data(serial, (void *)device_flags);