From fd2745c6e3dc2aa5e8d130d78122694602dcb3fd Mon Sep 17 00:00:00 2001 From: Artem Leonenko Date: Tue, 14 Dec 2010 23:46:55 -0800 Subject: [PATCH] --- yaml --- r: 227035 b: refs/heads/master c: 7c25a82684364da44643cbe3bdbd0f8835293767 h: refs/heads/master i: 227033: 9a5c0090cf5e70d789143ea5765d7d3d76a83698 227031: 2d695a65f99defd120bcc6f04ff42d2d39fb3dd6 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/ci13xxx_udc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4fc267627898..4f5769662c0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9bb9c1820cb2a7aeb5e42a5470cf208002d9aa8 +refs/heads/master: 7c25a82684364da44643cbe3bdbd0f8835293767 diff --git a/trunk/drivers/usb/gadget/ci13xxx_udc.c b/trunk/drivers/usb/gadget/ci13xxx_udc.c index f20e861deebf..0060eef0e923 100644 --- a/trunk/drivers/usb/gadget/ci13xxx_udc.c +++ b/trunk/drivers/usb/gadget/ci13xxx_udc.c @@ -1551,7 +1551,7 @@ __acquires(mEp->lock) list_del_init(&mReq->queue); mReq->req.status = -ESHUTDOWN; - if (!mReq->req.no_interrupt && mReq->req.complete != NULL) { + if (mReq->req.complete != NULL) { spin_unlock(mEp->lock); mReq->req.complete(&mEp->ep, &mReq->req); spin_lock(mEp->lock); @@ -1802,7 +1802,7 @@ __acquires(mEp->lock) _hardware_enqueue(mEp, mReqEnq); } - if (!mReq->req.no_interrupt && mReq->req.complete != NULL) { + if (mReq->req.complete != NULL) { spin_unlock(mEp->lock); mReq->req.complete(&mEp->ep, &mReq->req); spin_lock(mEp->lock); @@ -2213,7 +2213,7 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req) list_del_init(&mReq->queue); req->status = -ECONNRESET; - if (!mReq->req.no_interrupt && mReq->req.complete != NULL) { + if (mReq->req.complete != NULL) { spin_unlock(mEp->lock); mReq->req.complete(&mEp->ep, &mReq->req); spin_lock(mEp->lock);