aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2012-10-16 09:21:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-17 16:41:34 -0400
commitc5211187f7ff8e8dbff4ebf7c011ac4c0ffe319c (patch)
treef6fd25002da6e743e96ad7175d722b3992a563ec
parent014639003c77a51fc319c9fdf225e7747cb6e18d (diff)
USB: cdc-acm: fix pipe type of write endpoint
If the write endpoint is interrupt type, usb_sndintpipe() should be passed to usb_fill_int_urb() instead of usb_sndbulkpipe(). Cc: Oliver Neukum <oneukum@suse.de> Signed-off-by: Ming Lei <ming.lei@canonical.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/class/cdc-acm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 981f2132d128..572f4e7bd3ff 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1233,7 +1233,7 @@ made_compressed_probe:
1233 1233
1234 if (usb_endpoint_xfer_int(epwrite)) 1234 if (usb_endpoint_xfer_int(epwrite))
1235 usb_fill_int_urb(snd->urb, usb_dev, 1235 usb_fill_int_urb(snd->urb, usb_dev,
1236 usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress), 1236 usb_sndintpipe(usb_dev, epwrite->bEndpointAddress),
1237 NULL, acm->writesize, acm_write_bulk, snd, epwrite->bInterval); 1237 NULL, acm->writesize, acm_write_bulk, snd, epwrite->bInterval);
1238 else 1238 else
1239 usb_fill_bulk_urb(snd->urb, usb_dev, 1239 usb_fill_bulk_urb(snd->urb, usb_dev,