From: Bjørn Mork Date: Wed, 31 Oct 2012 05:08:38 +0000 (+0100) Subject: USB: option: never bind to a usb-storage interface X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1b95bee5630766448f40eecaa08b722f256335ea;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index e9cffac49cd5..2f01b2dce5b2 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, &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 */