Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit add12505 authored by Gavin Li's avatar Gavin Li Committed by Greg Kroah-Hartman
Browse files

cdc-acm: fix wrong pipe type on rx interrupt xfers 



This fixes the "BOGUS urb xfer" warning logged by usb_submit_urb().

Signed-off-by: default avatarGavin Li <git@thegavinli.com>
Acked-by: default avatarOliver Neukum <oneukum@suse.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fa254255

drivers/usb/class/cdc-acm.c

+2 −3
Original line number Diff line number Diff line
@@ -1354,7 +1354,6 @@ static int acm_probe(struct usb_interface *intf, 
	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;
@@ -1394,14 +1393,14 @@ static int acm_probe(struct usb_interface *intf, 
		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);

drivers/usb/class/cdc-acm.h

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ struct acm { 
	struct acm_rb read_buffers[ACM_NR];

	struct acm_wb *putbuffer;			/* for acm_tty_put_char() */

	int rx_buflimit;

	int rx_endpoint;

	spinlock_t read_lock;

	int write_used;					/* number of non-empty write buffers */

	int transmitting;