USB option driver K3765/K4505 avoid CDC_DATA interface

Currently the Option driver avoids binding interface 1 on Huawei K3765
and K4505 broadband modems as it should be handled by the cdc_ether
driver instead. This patch ensures we don't bind the interface 2
on those devices as that is CDC_DATA.

Signed-off-by: Andrew Bird <ajb@spheresystems.co.uk>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 78452baca88b10ade8212c734898cfb17854b10a..fe22e90bc879551a912ebcbcbf974a83c4ae0cb9 100644 (file)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1235,7 +1235,8 @@ static int option_probe(struct usb_serial *serial,
                (serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K3765 ||
                        serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4505 ||
                        serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4605) &&
-               serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
+               (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1 ||
+                       serial->interface->cur_altsetting->desc.bInterfaceNumber == 2))
                return -ENODEV;
 
        /* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */