Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364508
b: refs/heads/master
c: 776ffc1
h: refs/heads/master
v: v3
  • Loading branch information
Michael Grzeschik authored and Greg Kroah-Hartman committed Mar 30, 2013
1 parent 447e007 commit e3414cd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1cd12a9cf055e72b3094ef38ac4d9afff2e9520e
refs/heads/master: 776ffc16b74a5c19285135cfbc6dd02e1c733f25
3 changes: 2 additions & 1 deletion trunk/drivers/usb/chipidea/udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@ static int _hardware_enqueue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq)
mEp->qh.ptr->td.next = cpu_to_le32(mReq->dma); /* TERMINATE = 0 */
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 */

Expand Down Expand Up @@ -1008,6 +1007,8 @@ static int ep_enable(struct usb_ep *ep,

if (mEp->type == USB_ENDPOINT_XFER_CONTROL)
cap |= QH_IOS;
if (mEp->num)
cap |= QH_ZLT;
cap |= (mEp->ep.maxpacket << __ffs(QH_MAX_PKT)) & QH_MAX_PKT;

mEp->qh.ptr->cap = cpu_to_le32(cap);
Expand Down

0 comments on commit e3414cd

Please sign in to comment.