Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b95bee5 authored by Bjørn Mork's avatar Bjørn Mork Committed by Greg Kroah-Hartman
Browse files

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: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c73cee71

drivers/usb/serial/option.c

+2 −7
Original line number Diff line number Diff line
@@ -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 */