summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorAndrew Bird <ajb@spheresystems.co.uk>2011-08-17 00:20:03 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-22 13:55:51 -0700
commit6118514e8749105334f46ccec6faf9a439be6cf9 (patch)
treea0e0b84fb6202c1f4107d3e0ab3ac8d3c742b26b /drivers/usb/serial
parentc6eb2d75ffcdfafa37ff010bf467de20d468ef79 (diff)
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>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/option.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 78452baca88..fe22e90bc87 100644
--- 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 */