summaryrefslogtreecommitdiff
path: root/drivers/usb/storage/option_ms.c
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.com>2009-04-16 21:00:45 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-16 08:44:41 +0400
commitc5be1b52d9ea6ede4931691bf9f0bd454515aa52 (patch)
tree7094af3b339a6c3babc039f1984250902d386f1f /drivers/usb/storage/option_ms.c
parentcc71329b3b89b4a5be849b617f2c4f151f0b9213 (diff)
downloadlinux-c5be1b52d9ea6ede4931691bf9f0bd454515aa52.tar.xz
USB: Ignore storage device in modem mode on DWN-652
D-Link DWN-652 in Modem mode exposes 3 interfaces - First one is the USB storage one - Second one is for both control and connection - Third one is unknown This patch avoids usb-storage trying to switch again when already in modem mode, and exposes only 2 ttyUSB instead of 3 by not attaching to the storage interface Signed-off-by: Pascal Terjan <pterjan@mandriva.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/option_ms.c')
-rw-r--r--drivers/usb/storage/option_ms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/storage/option_ms.c b/drivers/usb/storage/option_ms.c
index 353f922939a4..126ea3424c03 100644
--- a/drivers/usb/storage/option_ms.c
+++ b/drivers/usb/storage/option_ms.c
@@ -94,7 +94,8 @@ int option_ms_init(struct us_data *us)
*/
if (udev->descriptor.bDeviceClass != 0 ||
udev->descriptor.bDeviceSubClass != 0 ||
- udev->descriptor.bDeviceProtocol != 0)
+ udev->descriptor.bDeviceProtocol != 0 ||
+ udev->actconfig->desc.bNumInterfaces == 3)
return USB_STOR_TRANSPORT_GOOD;
US_DEBUGP("Option MS: option_ms_init called\n");