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

Commit 61fbe96c authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

cdc-acm: Drop the warning for unusual capabilities 



Let's drop the warning for modems with unusual capabilities,
the associated quirk and blacklist. They made little sense.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0df1f248

drivers/usb/class/cdc-acm.c

+0 −7
Original line number Diff line number Diff line
@@ -1144,8 +1144,6 @@ static int acm_probe(struct usb_interface *intf, 
		case USB_CDC_CALL_MANAGEMENT_TYPE:

			call_management_function = buffer[3];

			call_interface_num = buffer[4];

			if ((quirks & NOT_A_MODEM) == 0 && (call_management_function & 3) != 3)

				dev_err(&intf->dev, "This device cannot do calls on its own. It is not a modem.\n");

			break;

		default:

			/* there are LOTS more CDC descriptors that
@@ -1796,11 +1794,6 @@ static const struct usb_device_id acm_ids[] = { 


	/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */



	/* Support Lego NXT using pbLua firmware */

	{ USB_DEVICE(0x0694, 0xff00),

	.driver_info = NOT_A_MODEM,

	},



	/* Support for Droids MuIn LCD */

	{ USB_DEVICE(0x04d8, 0x000b),

	.driver_info = NO_DATA_INTERFACE,

drivers/usb/class/cdc-acm.h

+0 −1
Original line number Diff line number Diff line
@@ -129,6 +129,5 @@ struct acm { 
#define NO_UNION_NORMAL			BIT(0)

#define SINGLE_RX_URB			BIT(1)

#define NO_CAP_LINE			BIT(2)

#define NOT_A_MODEM			BIT(3)

#define NO_DATA_INTERFACE		BIT(4)

#define IGNORE_DEVICE			BIT(5)