diff options
Diffstat (limited to 'drivers/usb/class')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 5 | ||||
-rw-r--r-- | drivers/usb/class/cdc-acm.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 71912301ef7f..0f3f62e81e5b 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -1354,7 +1354,6 @@ made_compressed_probe: | |||
1354 | spin_lock_init(&acm->write_lock); | 1354 | spin_lock_init(&acm->write_lock); |
1355 | spin_lock_init(&acm->read_lock); | 1355 | spin_lock_init(&acm->read_lock); |
1356 | mutex_init(&acm->mutex); | 1356 | mutex_init(&acm->mutex); |
1357 | acm->rx_endpoint = usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress); | ||
1358 | acm->is_int_ep = usb_endpoint_xfer_int(epread); | 1357 | acm->is_int_ep = usb_endpoint_xfer_int(epread); |
1359 | if (acm->is_int_ep) | 1358 | if (acm->is_int_ep) |
1360 | acm->bInterval = epread->bInterval; | 1359 | acm->bInterval = epread->bInterval; |
@@ -1394,14 +1393,14 @@ made_compressed_probe: | |||
1394 | urb->transfer_dma = rb->dma; | 1393 | urb->transfer_dma = rb->dma; |
1395 | if (acm->is_int_ep) { | 1394 | if (acm->is_int_ep) { |
1396 | usb_fill_int_urb(urb, acm->dev, | 1395 | usb_fill_int_urb(urb, acm->dev, |
1397 | acm->rx_endpoint, | 1396 | usb_rcvintpipe(usb_dev, epread->bEndpointAddress), |
1398 | rb->base, | 1397 | rb->base, |
1399 | acm->readsize, | 1398 | acm->readsize, |
1400 | acm_read_bulk_callback, rb, | 1399 | acm_read_bulk_callback, rb, |
1401 | acm->bInterval); | 1400 | acm->bInterval); |
1402 | } else { | 1401 | } else { |
1403 | usb_fill_bulk_urb(urb, acm->dev, | 1402 | usb_fill_bulk_urb(urb, acm->dev, |
1404 | acm->rx_endpoint, | 1403 | usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress), |
1405 | rb->base, | 1404 | rb->base, |
1406 | acm->readsize, | 1405 | acm->readsize, |
1407 | acm_read_bulk_callback, rb); | 1406 | acm_read_bulk_callback, rb); |
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 05ce308d5d2a..1f1eabfd8462 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h | |||
@@ -96,7 +96,6 @@ struct acm { | |||
96 | struct acm_rb read_buffers[ACM_NR]; | 96 | struct acm_rb read_buffers[ACM_NR]; |
97 | struct acm_wb *putbuffer; /* for acm_tty_put_char() */ | 97 | struct acm_wb *putbuffer; /* for acm_tty_put_char() */ |
98 | int rx_buflimit; | 98 | int rx_buflimit; |
99 | int rx_endpoint; | ||
100 | spinlock_t read_lock; | 99 | spinlock_t read_lock; |
101 | int write_used; /* number of non-empty write buffers */ | 100 | int write_used; /* number of non-empty write buffers */ |
102 | int transmitting; | 101 | int transmitting; |