Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 01:24:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cdc-acm: Drop the warning for unusual capabilities

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

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oliver Neukum 2014-10-28 10:20:29 +01:00 committed by Greg Kroah-Hartman
parent 0df1f2487d
commit 61fbe96c8b
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/class/cdc-acm.c
View File

@ -1144,8 +1144,6 @@ static int acm_probe(struct usb_interface *intf,
case USB_CDC_CALL_MANAGEMENT_TYPE: case USB_CDC_CALL_MANAGEMENT_TYPE:
call_management_function = buffer[3]; call_management_function = buffer[3];
call_interface_num = buffer[4]; 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; break;
default: default:
/* there are LOTS more CDC descriptors that /* 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! */ /* 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 */ /* Support for Droids MuIn LCD */
{ USB_DEVICE(0x04d8, 0x000b), { USB_DEVICE(0x04d8, 0x000b),
.driver_info = NO_DATA_INTERFACE, .driver_info = NO_DATA_INTERFACE,

1
drivers/usb/class/cdc-acm.h
View File

@ -129,6 +129,5 @@ struct acm {
#define NO_UNION_NORMAL BIT(0) #define NO_UNION_NORMAL BIT(0)
#define SINGLE_RX_URB BIT(1) #define SINGLE_RX_URB BIT(1)
#define NO_CAP_LINE BIT(2) #define NO_CAP_LINE BIT(2)
#define NOT_A_MODEM BIT(3)
#define NO_DATA_INTERFACE BIT(4) #define NO_DATA_INTERFACE BIT(4)
#define IGNORE_DEVICE BIT(5) #define IGNORE_DEVICE BIT(5)