system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-23 04:49:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB: gadget: Fix bug in endpoint feature request processing in ci13xxx_udc

Browse source 
The OUT endpoints are stored in 0 - hw_ep_max/2 and IN endpoints are
stored from hw_ep_max/2 - hw_ep_max in ci13xxx_ep array.  Retrieve
the IN endpoint correctly while processing endpoint feature requests.

Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pavankumar Kondeti 2011-05-02 11:56:30 +05:30 committed by Greg Kroah-Hartman
parent 986b11b8c7
commit 4c5212b768
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/usb/gadget/ci13xxx_udc.c
View file

@ -1894,7 +1894,7 @@ __acquires(udc->lock)
for (i = 0; i < hw_ep_max; i++) { for (i = 0; i < hw_ep_max; i++) {
struct ci13xxx_ep *mEp = &udc->ci13xxx_ep[i]; struct ci13xxx_ep *mEp = &udc->ci13xxx_ep[i];
int type, num, err = -EINVAL; int type, num, dir, err = -EINVAL;
struct usb_ctrlrequest req; struct usb_ctrlrequest req;
if (mEp->desc == NULL) if (mEp->desc == NULL)
@ -1952,7 +1952,10 @@ __acquires(udc->lock)
if (req.wLength != 0) if (req.wLength != 0)
break; break;
num = le16_to_cpu(req.wIndex); num = le16_to_cpu(req.wIndex);
dir = num & USB_ENDPOINT_DIR_MASK;
num &= USB_ENDPOINT_NUMBER_MASK; num &= USB_ENDPOINT_NUMBER_MASK;
if (dir) /* TX */
num += hw_ep_max/2;
if (!udc->ci13xxx_ep[num].wedge) { if (!udc->ci13xxx_ep[num].wedge) {
spin_unlock(udc->lock); spin_unlock(udc->lock);
err = usb_ep_clear_halt( err = usb_ep_clear_halt(
@ -2001,7 +2004,10 @@ __acquires(udc->lock)
if (req.wLength != 0) if (req.wLength != 0)
break; break;
num = le16_to_cpu(req.wIndex); num = le16_to_cpu(req.wIndex);
dir = num & USB_ENDPOINT_DIR_MASK;
num &= USB_ENDPOINT_NUMBER_MASK; num &= USB_ENDPOINT_NUMBER_MASK;
if (dir) /* TX */
num += hw_ep_max/2;
spin_unlock(udc->lock); spin_unlock(udc->lock);
err = usb_ep_set_halt(&udc->ci13xxx_ep[num].ep); err = usb_ep_set_halt(&udc->ci13xxx_ep[num].ep);