diff options
author | Artem Leonenko <tikkeri@gmail.com> | 2010-12-15 02:46:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 16:32:37 -0500 |
commit | 7c25a82684364da44643cbe3bdbd0f8835293767 (patch) | |
tree | d6d9d063be42337f9ecc60f2ffac31b364157cb3 /drivers/usb/gadget | |
parent | d9bb9c1820cb2a7aeb5e42a5470cf208002d9aa8 (diff) |
USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
CI13xxx UDC driver doesn't call complete() callback for requests
with flag no_interrupt set. Thus gadget drivers (like g_ether) are
never notifed about successfully (or not) transmitted requests. As
a result in case of g_ether and queued request with no_interrupt=1
fields g_ether is never notifed about sent packets and TX stalls.
Solution: treat no_interrupt flag like all other UDC drivers do and
call complete() callback for all requests.
Signed-off-by: Artem Leonenko <tikkeri@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/ci13xxx_udc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c index f20e861deebf..0060eef0e923 100644 --- a/drivers/usb/gadget/ci13xxx_udc.c +++ b/drivers/usb/gadget/ci13xxx_udc.c | |||
@@ -1551,7 +1551,7 @@ __acquires(mEp->lock) | |||
1551 | list_del_init(&mReq->queue); | 1551 | list_del_init(&mReq->queue); |
1552 | mReq->req.status = -ESHUTDOWN; | 1552 | mReq->req.status = -ESHUTDOWN; |
1553 | 1553 | ||
1554 | if (!mReq->req.no_interrupt && mReq->req.complete != NULL) { | 1554 | if (mReq->req.complete != NULL) { |
1555 | spin_unlock(mEp->lock); | 1555 | spin_unlock(mEp->lock); |
1556 | mReq->req.complete(&mEp->ep, &mReq->req); | 1556 | mReq->req.complete(&mEp->ep, &mReq->req); |
1557 | spin_lock(mEp->lock); | 1557 | spin_lock(mEp->lock); |
@@ -1802,7 +1802,7 @@ __acquires(mEp->lock) | |||
1802 | _hardware_enqueue(mEp, mReqEnq); | 1802 | _hardware_enqueue(mEp, mReqEnq); |
1803 | } | 1803 | } |
1804 | 1804 | ||
1805 | if (!mReq->req.no_interrupt && mReq->req.complete != NULL) { | 1805 | if (mReq->req.complete != NULL) { |
1806 | spin_unlock(mEp->lock); | 1806 | spin_unlock(mEp->lock); |
1807 | mReq->req.complete(&mEp->ep, &mReq->req); | 1807 | mReq->req.complete(&mEp->ep, &mReq->req); |
1808 | spin_lock(mEp->lock); | 1808 | spin_lock(mEp->lock); |
@@ -2213,7 +2213,7 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req) | |||
2213 | list_del_init(&mReq->queue); | 2213 | list_del_init(&mReq->queue); |
2214 | req->status = -ECONNRESET; | 2214 | req->status = -ECONNRESET; |
2215 | 2215 | ||
2216 | if (!mReq->req.no_interrupt && mReq->req.complete != NULL) { | 2216 | if (mReq->req.complete != NULL) { |
2217 | spin_unlock(mEp->lock); | 2217 | spin_unlock(mEp->lock); |
2218 | mReq->req.complete(&mEp->ep, &mReq->req); | 2218 | mReq->req.complete(&mEp->ep, &mReq->req); |
2219 | spin_lock(mEp->lock); | 2219 | spin_lock(mEp->lock); |