Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 1b95bee5630766448f40eecaa08b722f256335ea

Authored by Bjørn Mork
Committed by Greg Kroah-Hartman
1 parent c73cee717e
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 2 additions and 7 deletions Side-by-side Diff

drivers/usb/serial/option.c
Diff comments   View file @ 1b95bee
... ... @@ -1340,13 +1340,8 @@
1340 1340 &serial->interface->cur_altsetting->desc;
1341 1341 struct usb_device_descriptor *dev_desc = &serial->dev->descriptor;
1342 1342  
1343   - /*
1344   - * D-Link DWM 652 still exposes CD-Rom emulation interface in modem
1345   - * mode.
1346   - */
1347   - if (dev_desc->idVendor == DLINK_VENDOR_ID &&
1348   - dev_desc->idProduct == DLINK_PRODUCT_DWM_652 &&
1349   - iface_desc->bInterfaceClass == 0x08)
  1343 + /* Never bind to the CD-Rom emulation interface */
  1344 + if (iface_desc->bInterfaceClass == 0x08)
1350 1345 return -ENODEV;
1351 1346  
1352 1347 /* Bandrich modem and AT command interface is 0xff */