From: Pavankumar Kondeti <pkondeti@codeaurora.org>
To: greg@kroah.com, linux-usb@vger.kernel.org
Cc: linux-arm-msm@vger.kernel.org,
Pavankumar Kondeti <pkondeti@codeaurora.org>
Subject: [PATCH 4/7] USB: gadget: Fix bug in endpoint feature request processing in ci13xxx_udc
Date: Fri, 29 Apr 2011 10:42:52 +0530 [thread overview]
Message-ID: <1304053975-1960-4-git-send-email-pkondeti@codeaurora.org> (raw)
In-Reply-To: <1304053975-1960-1-git-send-email-pkondeti@codeaurora.org>
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>
---
drivers/usb/gadget/ci13xxx_udc.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 92498ae..1b095cb 100644
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -1894,7 +1894,7 @@ __acquires(udc->lock)
for (i = 0; i < hw_ep_max; i++) {
struct ci13xxx_ep *mEp = &udc->ci13xxx_ep[i];
- int type, num, err = -EINVAL;
+ int type, num, dir, err = -EINVAL;
struct usb_ctrlrequest req;
if (mEp->desc == NULL)
@@ -1952,7 +1952,10 @@ __acquires(udc->lock)
if (req.wLength != 0)
break;
num = le16_to_cpu(req.wIndex);
+ dir = num & USB_ENDPOINT_DIR_MASK;
num &= USB_ENDPOINT_NUMBER_MASK;
+ if (dir) /* TX */
+ num += hw_ep_max/2;
if (!udc->ci13xxx_ep[num].wedge) {
spin_unlock(udc->lock);
err = usb_ep_clear_halt(
@@ -2001,7 +2004,10 @@ __acquires(udc->lock)
if (req.wLength != 0)
break;
num = le16_to_cpu(req.wIndex);
+ dir = num & USB_ENDPOINT_DIR_MASK;
num &= USB_ENDPOINT_NUMBER_MASK;
+ if (dir) /* TX */
+ num += hw_ep_max/2;
spin_unlock(udc->lock);
err = usb_ep_set_halt(&udc->ci13xxx_ep[num].ep);
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
next prev parent reply other threads:[~2011-04-29 5:13 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-28 7:58 [PATCH 1/5] USB: gadget: Fix unused variable warning in ci13xxx_udc Pavankumar Kondeti
2011-04-28 7:58 ` [PATCH 2/5] USB: gadget: Fix bug in endpoint feature request processing " Pavankumar Kondeti
[not found] ` <1303977501-17115-1-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2011-04-28 7:58 ` [PATCH 3/5] USB: gadget: Use ep0out for control OUT data phase " Pavankumar Kondeti
2011-04-28 7:58 ` [PATCH 4/5] USB: gadget: Initialize ep0 once while registering gadget " Pavankumar Kondeti
2011-04-28 7:58 ` [PATCH 5/5] USB: OTG: msm: Clear in_lpm flag before enabling the IRQ in resume Pavankumar Kondeti
2011-04-28 10:01 ` [PATCH 1/5] USB: gadget: Fix unused variable warning in ci13xxx_udc Michal Nazarewicz
2011-04-28 10:19 ` Pavan Kondeti
[not found] ` <4DB93F48.4050803-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2011-04-28 16:30 ` David Brown
2011-04-29 5:12 ` [PATCH 1/7] USB: gadget: Fix typo (s/EBUSY/-EBUSY) " Pavankumar Kondeti
2011-04-29 5:12 ` [PATCH 2/7] USB: gadget: Use bitwise AND operator to test flags " Pavankumar Kondeti
2011-04-29 5:12 ` [PATCH 3/7] USB: gadget: Fix unused variable warning " Pavankumar Kondeti
2011-04-29 5:12 ` Pavankumar Kondeti [this message]
2011-04-29 5:12 ` [PATCH 6/7] USB: gadget: Initialize ep0 once while registering gadget " Pavankumar Kondeti
2011-04-29 5:12 ` [PATCH 7/7] USB: OTG: msm: Clear in_lpm flag before enabling the IRQ in resume Pavankumar Kondeti
[not found] ` <1304053975-1960-1-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2011-04-29 5:12 ` [PATCH 5/7] USB: gadget: Use ep0out for control OUT data phase in ci13xxx_udc Pavankumar Kondeti
2011-04-29 16:04 ` [PATCH 1/7] USB: gadget: Fix typo (s/EBUSY/-EBUSY) " David Brown
[not found] ` <8yay62txcwc.fsf-AOX6H5vLt3Uj8izMo0bVsAC/G2K4zDHf@public.gmane.org>
2011-04-30 0:29 ` Greg KH
2011-05-02 5:44 ` Pavan Kondeti
2011-05-02 6:09 ` Pavan Kondeti
2011-05-02 6:26 ` [PATCH V2 0/7] Typo & BUG fixes for MSM USB drivers Pavankumar Kondeti
[not found] ` <1304317593-21808-1-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2011-05-02 6:26 ` [PATCH V2 1/7] USB: gadget: Fix typo (s/EBUSY/-EBUSY) in ci13xxx_udc Pavankumar Kondeti
2011-05-02 6:26 ` [PATCH V2 3/7] USB: gadget: Fix unused variable warning " Pavankumar Kondeti
2011-05-02 6:26 ` [PATCH V2 2/7] USB: gadget: Use bitwise AND operator to test flags " Pavankumar Kondeti
2011-05-02 6:26 ` [PATCH V2 4/7] USB: gadget: Fix bug in endpoint feature request processing " Pavankumar Kondeti
2011-05-02 6:26 ` [PATCH V2 5/7] USB: gadget: Use ep0out for control OUT data phase " Pavankumar Kondeti
2011-05-02 6:26 ` [PATCH V2 6/7] USB: gadget: Initialize ep0 once while registering gadget " Pavankumar Kondeti
2011-05-02 6:26 ` [PATCH V2 7/7] USB: OTG: msm: Clear in_lpm flag before enabling the IRQ in resume Pavankumar Kondeti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1304053975-1960-4-git-send-email-pkondeti@codeaurora.org \
--to=pkondeti@codeaurora.org \
--cc=greg@kroah.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).