Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0bf2ef9 authored by Johan Hovold's avatar Johan Hovold
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent c3a65808

drivers/usb/serial/option.c

+0 −9
Original line number Diff line number Diff line
@@ -1975,7 +1975,6 @@ static int option_probe(struct usb_serial *serial, 
{

	struct usb_interface_descriptor *iface_desc =

				&serial->interface->cur_altsetting->desc;

	struct usb_device_descriptor *dev_desc = &serial->dev->descriptor;

	unsigned long device_flags = id->driver_info;



	/* 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))

		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. */

	usb_set_serial_data(serial, (void *)device_flags);