commit: 6118514e8749105334f46ccec6faf9a439be6cf9
From: Andrew Bird <a...@spheresystems.co.uk>
Date: Wed, 17 Aug 2011 00:20:03 +0100
Subject: [PATCH] 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 <a...@spheresystems.co.uk>
Cc: stable <sta...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
drivers/usb/serial/option.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 78452ba..fe22e90 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 */
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
