Skip to content

Commit

Permalink
USB: option: never bind to a usb-storage interface
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjørn Mork authored and Greg Kroah-Hartman committed Oct 31, 2012
1 parent c73cee7 commit 1b95bee
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/usb/serial/option.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 1b95bee

Please sign in to comment.