From 00d9dcc0de9e737d1e5ad65502e2da07fa6ed51d Mon Sep 17 00:00:00 2001 From: Michael Grzeschik Date: Sat, 30 Mar 2013 12:54:04 +0200 Subject: [PATCH] --- yaml --- r: 364506 b: refs/heads/master c: 080ff5f4719e21c78f8ec96eea4f82b2fd047fa4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/chipidea/udc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 441ab60a2b61..f46a2a957c25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 938d323f14480ca8dcb9dbbe48add35a09246d09 +refs/heads/master: 080ff5f4719e21c78f8ec96eea4f82b2fd047fa4 diff --git a/trunk/drivers/usb/chipidea/udc.c b/trunk/drivers/usb/chipidea/udc.c index ff393e1ecf4a..0e11172a4c84 100644 --- a/trunk/drivers/usb/chipidea/udc.c +++ b/trunk/drivers/usb/chipidea/udc.c @@ -461,7 +461,8 @@ static int _hardware_enqueue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq) /* QH configuration */ mEp->qh.ptr->td.next = cpu_to_le32(mReq->dma); /* TERMINATE = 0 */ - mEp->qh.ptr->td.token &= cpu_to_le32(~TD_STATUS); /* clear status */ + mEp->qh.ptr->td.token &= + cpu_to_le32(~(TD_STATUS_HALTED|TD_STATUS_ACTIVE)); mEp->qh.ptr->cap |= cpu_to_le32(QH_ZLT); wmb(); /* synchronize before ep prime */