diff options
| author | Bjørn Mork <bjorn@mork.no> | 2012-10-31 01:08:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-31 15:58:11 -0400 |
| commit | 1b95bee5630766448f40eecaa08b722f256335ea (patch) | |
| tree | fadcb86f05ebd73efccdecf5c7ce2ec8a283985e /drivers/usb/serial | |
| parent | c73cee717e7d5da0698acb720ad1219646fe4f46 (diff) | |
USB: option: never bind to a usb-storage interface
There are many modems in addition to the D-Link DWM 652
exposing the CD interface in modem mode, and some expose
an integrated card reader as well. Always ignore these
interfaces.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/option.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index e9cffac49cd..2f01b2dce5b 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -1340,13 +1340,8 @@ static int option_probe(struct usb_serial *serial, | |||
| 1340 | &serial->interface->cur_altsetting->desc; | 1340 | &serial->interface->cur_altsetting->desc; |
| 1341 | struct usb_device_descriptor *dev_desc = &serial->dev->descriptor; | 1341 | struct usb_device_descriptor *dev_desc = &serial->dev->descriptor; |
| 1342 | 1342 | ||
| 1343 | /* | 1343 | /* Never bind to the CD-Rom emulation interface */ |
| 1344 | * D-Link DWM 652 still exposes CD-Rom emulation interface in modem | 1344 | if (iface_desc->bInterfaceClass == 0x08) |
| 1345 | * mode. | ||
| 1346 | */ | ||
| 1347 | if (dev_desc->idVendor == DLINK_VENDOR_ID && | ||
| 1348 | dev_desc->idProduct == DLINK_PRODUCT_DWM_652 && | ||
| 1349 | iface_desc->bInterfaceClass == 0x08) | ||
| 1350 | return -ENODEV; | 1345 | return -ENODEV; |
| 1351 | 1346 | ||
| 1352 | /* Bandrich modem and AT command interface is 0xff */ | 1347 | /* Bandrich modem and AT command interface is 0xff */ |