cxacru: Use a bulk/int URB to access the command endpoint
Subsystems (3)
PATCH 1/1 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 f661c6f8c67bd55e93348f160d590ff9edf08904, 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 Simon Arlott <[email protected]>
--- drivers/usb/atm/cxacru.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-)
drivers/usb/atm/cxacru.c +22 -2
@@ -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,15 +1172,34 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, goto fail; } -usb_fill_int_urb (instance->rcv_urb, +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 , cxacru_blocking_completion, &instance->rcv_done,1 ); -usb_fill_int_urb (instance->snd_urb, +usb_fill_int_urb (instance->snd_urb, 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);
Signature · 4 lines
1.7.0.4 -- Simon Arlott