diff options
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 78f0f85bebdc..fada988512a1 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -932,8 +932,6 @@ static int wait_serial_change(struct acm *acm, unsigned long arg) | |||
932 | DECLARE_WAITQUEUE(wait, current); | 932 | DECLARE_WAITQUEUE(wait, current); |
933 | struct async_icount old, new; | 933 | struct async_icount old, new; |
934 | 934 | ||
935 | if (arg & (TIOCM_DSR | TIOCM_RI | TIOCM_CD)) | ||
936 | return -EINVAL; | ||
937 | do { | 935 | do { |
938 | spin_lock_irq(&acm->read_lock); | 936 | spin_lock_irq(&acm->read_lock); |
939 | old = acm->oldcount; | 937 | old = acm->oldcount; |
@@ -1161,6 +1159,8 @@ static int acm_probe(struct usb_interface *intf, | |||
1161 | if (quirks == IGNORE_DEVICE) | 1159 | if (quirks == IGNORE_DEVICE) |
1162 | return -ENODEV; | 1160 | return -ENODEV; |
1163 | 1161 | ||
1162 | memset(&h, 0x00, sizeof(struct usb_cdc_parsed_header)); | ||
1163 | |||
1164 | num_rx_buf = (quirks == SINGLE_RX_URB) ? 1 : ACM_NR; | 1164 | num_rx_buf = (quirks == SINGLE_RX_URB) ? 1 : ACM_NR; |
1165 | 1165 | ||
1166 | /* handle quirks deadly to normal probing*/ | 1166 | /* handle quirks deadly to normal probing*/ |