diff options
Diffstat (limited to 'drivers/usb/class')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 1 | ||||
-rw-r--r-- | drivers/usb/class/cdc-wdm.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index e35b1508d3eb..235e305f8473 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -913,7 +913,6 @@ static int get_serial_info(struct acm *acm, struct serial_struct __user *info) | |||
913 | struct serial_struct tmp; | 913 | struct serial_struct tmp; |
914 | 914 | ||
915 | memset(&tmp, 0, sizeof(tmp)); | 915 | memset(&tmp, 0, sizeof(tmp)); |
916 | tmp.flags = ASYNC_LOW_LATENCY; | ||
917 | tmp.xmit_fifo_size = acm->writesize; | 916 | tmp.xmit_fifo_size = acm->writesize; |
918 | tmp.baud_base = le32_to_cpu(acm->line.dwDTERate); | 917 | tmp.baud_base = le32_to_cpu(acm->line.dwDTERate); |
919 | tmp.close_delay = acm->port.close_delay / 10; | 918 | tmp.close_delay = acm->port.close_delay / 10; |
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index 0a6369510f2d..8fda45a45bd3 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c | |||
@@ -531,7 +531,7 @@ retry: | |||
531 | i++; | 531 | i++; |
532 | if (file->f_flags & O_NONBLOCK) { | 532 | if (file->f_flags & O_NONBLOCK) { |
533 | if (!test_bit(WDM_READ, &desc->flags)) { | 533 | if (!test_bit(WDM_READ, &desc->flags)) { |
534 | rv = cntr ? cntr : -EAGAIN; | 534 | rv = -EAGAIN; |
535 | goto err; | 535 | goto err; |
536 | } | 536 | } |
537 | rv = 0; | 537 | rv = 0; |