diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-11-14 09:34:01 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-11-14 09:34:01 +1100 |
| commit | 185c0f26c0267d5978b5c30d3a04f90cb245cd76 (patch) | |
| tree | 4b1324c9445bbcff095fb3ce755ec46d315bda5a /drivers/usb/class/cdc-acm.c | |
| parent | eafb7b9d01a7001ff8e9624e7dcb706844f981b3 (diff) | |
| parent | a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 (diff) | |
Merge commit 'v4.9-rc5' into next
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) DECLARE_WAITQUEUE(wait, current); struct async_icount old, new; - if (arg & (TIOCM_DSR | TIOCM_RI | TIOCM_CD)) - return -EINVAL; do { spin_lock_irq(&acm->read_lock); old = acm->oldcount; @@ -1161,6 +1159,8 @@ static int acm_probe(struct usb_interface *intf, if (quirks == IGNORE_DEVICE) return -ENODEV; + memset(&h, 0x00, sizeof(struct usb_cdc_parsed_header)); + num_rx_buf = (quirks == SINGLE_RX_URB) ? 1 : ACM_NR; /* handle quirks deadly to normal probing*/ |