aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/class/cdc-acm.c7
-rw-r--r--drivers/usb/class/cdc-acm.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index e934e19f49f5..a78a7a4560c8 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1144,8 +1144,6 @@ static int acm_probe(struct usb_interface *intf,
1144 case USB_CDC_CALL_MANAGEMENT_TYPE: 1144 case USB_CDC_CALL_MANAGEMENT_TYPE:
1145 call_management_function = buffer[3]; 1145 call_management_function = buffer[3];
1146 call_interface_num = buffer[4]; 1146 call_interface_num = buffer[4];
1147 if ((quirks & NOT_A_MODEM) == 0 && (call_management_function & 3) != 3)
1148 dev_err(&intf->dev, "This device cannot do calls on its own. It is not a modem.\n");
1149 break; 1147 break;
1150 default: 1148 default:
1151 /* there are LOTS more CDC descriptors that 1149 /* there are LOTS more CDC descriptors that
@@ -1796,11 +1794,6 @@ static const struct usb_device_id acm_ids[] = {
1796 1794
1797 /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */ 1795 /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
1798 1796
1799 /* Support Lego NXT using pbLua firmware */
1800 { USB_DEVICE(0x0694, 0xff00),
1801 .driver_info = NOT_A_MODEM,
1802 },
1803
1804 /* Support for Droids MuIn LCD */ 1797 /* Support for Droids MuIn LCD */
1805 { USB_DEVICE(0x04d8, 0x000b), 1798 { USB_DEVICE(0x04d8, 0x000b),
1806 .driver_info = NO_DATA_INTERFACE, 1799 .driver_info = NO_DATA_INTERFACE,
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index fc75651afe1c..8cd2c4b0b8ff 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -129,6 +129,5 @@ struct acm {
129#define NO_UNION_NORMAL BIT(0) 129#define NO_UNION_NORMAL BIT(0)
130#define SINGLE_RX_URB BIT(1) 130#define SINGLE_RX_URB BIT(1)
131#define NO_CAP_LINE BIT(2) 131#define NO_CAP_LINE BIT(2)
132#define NOT_A_MODEM BIT(3)
133#define NO_DATA_INTERFACE BIT(4) 132#define NO_DATA_INTERFACE BIT(4)
134#define IGNORE_DEVICE BIT(5) 133#define IGNORE_DEVICE BIT(5)