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

Commit 902ffc3c authored by Simon Arlott's avatar Simon Arlott Committed by Greg Kroah-Hartman
Browse files

USB: cxacru: Use a bulk/int URB to access the command endpoint 



The command endpoint is either a bulk or interrupt endpoint, but using
the wrong type of transfer causes an error if CONFIG_USB_DEBUG is
enabled after commit f661c6f8, which
checks for this mismatch.

Detect which type of endpoint it is and use a bulk/int URB as
appropriate. There are other function calls specifying a bulk pipe,
but usb_clear_halt doesn't use the pipe type (only the endpoint) and
usb_bulk_msg auto-detects interrupt transfers.

Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
Cc: stable <stable@kernel.org> [.34 and newer]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 870408c8

drivers/usb/atm/cxacru.c

+22 −2
Original line number Diff line number Diff line
@@ -1127,6 +1127,7 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, 
{

	struct cxacru_data *instance;

	struct usb_device *usb_dev = interface_to_usbdev(intf);

	struct usb_host_endpoint *cmd_ep = usb_dev->ep_in[CXACRU_EP_CMD];

	int ret;



	/* instance init */
@@ -1171,6 +1172,14 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, 
		goto fail;

	}



	if (!cmd_ep) {

		dbg("cxacru_bind: no command endpoint");

		ret = -ENODEV;

		goto fail;

	}



	if ((cmd_ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

			== USB_ENDPOINT_XFER_INT) {

		usb_fill_int_urb(instance->rcv_urb,

			usb_dev, usb_rcvintpipe(usb_dev, CXACRU_EP_CMD),

			instance->rcv_buf, PAGE_SIZE,
@@ -1180,6 +1189,17 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, 
			usb_dev, usb_sndintpipe(usb_dev, CXACRU_EP_CMD),

			instance->snd_buf, PAGE_SIZE,

			cxacru_blocking_completion, &instance->snd_done, 4);

	} else {

		usb_fill_bulk_urb(instance->rcv_urb,

			usb_dev, usb_rcvbulkpipe(usb_dev, CXACRU_EP_CMD),

			instance->rcv_buf, PAGE_SIZE,

			cxacru_blocking_completion, &instance->rcv_done);



		usb_fill_bulk_urb(instance->snd_urb,

			usb_dev, usb_sndbulkpipe(usb_dev, CXACRU_EP_CMD),

			instance->snd_buf, PAGE_SIZE,

			cxacru_blocking_completion, &instance->snd_done);

	}



	mutex_init(&instance->cm_serialize);