leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: option: never bind to a usb-storage interface

Browse Source 
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>
This commit is contained in:
Bjørn Mork 2012-10-31 06:08:38 +01:00 committed by Greg Kroah-Hartman
parent c73cee717e
commit 1b95bee563
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/serial/option.c
View File

@ -1340,13 +1340,8 @@ static int option_probe(struct usb_serial *serial,
&serial->interface->cur_altsetting->desc;
struct usb_device_descriptor *dev_desc = &serial->dev->descriptor;
/*
* D-Link DWM 652 still exposes CD-Rom emulation interface in modem
* mode.
*/
if (dev_desc->idVendor == DLINK_VENDOR_ID &&
dev_desc->idProduct == DLINK_PRODUCT_DWM_652 &&
iface_desc->bInterfaceClass == 0x08)
/* Never bind to the CD-Rom emulation interface */
if (iface_desc->bInterfaceClass == 0x08)
return -ENODEV;
/* Bandrich modem and AT command interface is 0xff */