diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-07 14:36:44 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-07 14:36:44 -0700 |
| commit | 5c0fc54c9b67e04d533b5ebec718d37f747a9170 (patch) | |
| tree | d84f18a4e233beca860dc416445160c847bb83cc /drivers/usb/class/cdc-acm.c | |
| parent | 18cb0eedcc22a6df7da9e106d0c8741e647e4f87 (diff) | |
| parent | 2cb99ded2f551c78506e5f7bbf6c0d7613351ab1 (diff) | |
Merge tag 'v4.4.20' into android-4.4.y
This is the 4.4.20 stable release
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index d37fdcc3143c..7f374369e539 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1336,7 +1336,6 @@ made_compressed_probe: spin_lock_init(&acm->write_lock); spin_lock_init(&acm->read_lock); mutex_init(&acm->mutex); - acm->rx_endpoint = usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress); acm->is_int_ep = usb_endpoint_xfer_int(epread); if (acm->is_int_ep) acm->bInterval = epread->bInterval; @@ -1376,14 +1375,14 @@ made_compressed_probe: urb->transfer_dma = rb->dma; if (acm->is_int_ep) { usb_fill_int_urb(urb, acm->dev, - acm->rx_endpoint, + usb_rcvintpipe(usb_dev, epread->bEndpointAddress), rb->base, acm->readsize, acm_read_bulk_callback, rb, acm->bInterval); } else { usb_fill_bulk_urb(urb, acm->dev, - acm->rx_endpoint, + usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress), rb->base, acm->readsize, acm_read_bulk_callback, rb); |