From b1fa8ac5722af77bbd508f4ee19d493b0224b9ed Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 23 Dec 2015 17:51:35 +0000 Subject: [PATCH] USB: cdc-acm - Add IGNORE_DEVICE quirk Extracted from commit 16142655269a ("USB: cdc-acm - blacklist IMS PCU device"). Signed-off-by: Ben Hutchings --- drivers/usb/class/cdc-acm.c | 4 ++++ drivers/usb/class/cdc-acm.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index ca666d0a433fe..c0beb2f47248d 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -916,6 +916,10 @@ static int acm_probe(struct usb_interface *intf, /* normal quirks */ quirks = (unsigned long)id->driver_info; + + if (quirks == IGNORE_DEVICE) + return -ENODEV; + num_rx_buf = (quirks == SINGLE_RX_URB) ? 1 : ACM_NR; /* handle quirks deadly to normal probing*/ diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 7aa5e9a9df299..9af5ad24c7b91 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h @@ -127,4 +127,5 @@ struct acm { #define NO_CAP_LINE 4 #define NOT_A_MODEM 8 #define NO_DATA_INTERFACE 16 +#define IGNORE_DEVICE 32 #define CLEAR_HALT_CONDITIONS BIT(7) -- 2.47.2