aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.h
diff options
context:
space:
mode:
authorErik Slagter <erik@slagter.name>2011-05-11 06:06:55 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-11 18:14:28 -0400
commitfd5054c169d29747a44b4e1419ff47f57ae82dbc (patch)
treeaa352fe27998b7f1e9bced69d4e46e0990ff891c /drivers/usb/class/cdc-acm.h
parenta9df304cf78d76108196da1ff1dad4d9a5737c2e (diff)
USB: cdc_acm: Fix oops when Droids MuIn LCD is connected
The Droids MuIn LCD operates like a serial remote terminal. Data received are displayed directly on the LCD. This patch fixes the kernel null pointer oops when it is plugged in. Add NO_DATA_INTERFACE quirk to tell the driver that "control" and "data" interfaces are not separated for this device, which prevents dereferencing a null pointer in the device probe code. Signed-off-by: Erik Slagter <erik@slagter.name> Signed-off-by: Maxin B. John <maxin.john@gmail.com> Tested-by: Erik Slagter <erik@slagter.name> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/class/cdc-acm.h')
-rw-r--r--drivers/usb/class/cdc-acm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 7b5c0bd07f80..ca7937f26e27 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -126,3 +126,4 @@ struct acm {
126#define SINGLE_RX_URB 2 126#define SINGLE_RX_URB 2
127#define NO_CAP_LINE 4 127#define NO_CAP_LINE 4
128#define NOT_A_MODEM 8 128#define NOT_A_MODEM 8
129#define NO_DATA_INTERFACE 16