xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: serial: option: drop redundant interface-class test

Browse Source 
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>
This commit is contained in:
Johan Hovold
2018-03-07 11:49:55 +01:00
parent c3a65808f0
commit a0bf2ef978
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/serial/option.c
View File

@@ -1975,7 +1975,6 @@ static int option_probe(struct usb_serial *serial,
{ {
struct usb_interface_descriptor *iface_desc = struct usb_interface_descriptor *iface_desc =
&serial->interface->cur_altsetting->desc; &serial->interface->cur_altsetting->desc;
struct usb_device_descriptor *dev_desc = &serial->dev->descriptor;
unsigned long device_flags = id->driver_info; unsigned long device_flags = id->driver_info;
/* Never bind to the CD-Rom emulation interface */ /* Never bind to the CD-Rom emulation interface */
@@ -1989,14 +1988,6 @@ static int option_probe(struct usb_serial *serial,
*/ */
if (device_flags & RSVD(iface_desc->bInterfaceNumber)) if (device_flags & RSVD(iface_desc->bInterfaceNumber))
return -ENODEV; return -ENODEV;
/*
* Don't bind network interface on Samsung GT-B3730, it is handled by
* a separate module.
*/
if (dev_desc->idVendor == cpu_to_le16(SAMSUNG_VENDOR_ID) &&
dev_desc->idProduct == cpu_to_le16(SAMSUNG_PRODUCT_GT_B3730) &&
iface_desc->bInterfaceClass != USB_CLASS_CDC_DATA)
return -ENODEV;
/* Store the device flags so we can use them during attach. */ /* Store the device flags so we can use them during attach. */
usb_set_serial_data(serial, (void *)device_flags); usb_set_serial_data(serial, (void *)device_flags);