aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/chipidea/ci.h1
-rw-r--r--drivers/usb/chipidea/udc.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
index 68577d1f1c0d..b0a6bce064ca 100644
--- a/drivers/usb/chipidea/ci.h
+++ b/drivers/usb/chipidea/ci.h
@@ -21,6 +21,7 @@
21/****************************************************************************** 21/******************************************************************************
22 * DEFINE 22 * DEFINE
23 *****************************************************************************/ 23 *****************************************************************************/
24#define TD_PAGE_COUNT 5
24#define CI13XXX_PAGE_SIZE 4096ul /* page size for TD's */ 25#define CI13XXX_PAGE_SIZE 4096ul /* page size for TD's */
25#define ENDPT_MAX 32 26#define ENDPT_MAX 32
26 27
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index ec218b0202c0..e502e4807812 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -429,7 +429,7 @@ static int _hardware_enqueue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq)
429 mReq->ptr->token |= cpu_to_le32(TD_IOC); 429 mReq->ptr->token |= cpu_to_le32(TD_IOC);
430 } 430 }
431 mReq->ptr->page[0] = cpu_to_le32(mReq->req.dma); 431 mReq->ptr->page[0] = cpu_to_le32(mReq->req.dma);
432 for (i = 1; i < 5; i++) { 432 for (i = 1; i < TD_PAGE_COUNT; i++) {
433 u32 page = mReq->req.dma + i * CI13XXX_PAGE_SIZE; 433 u32 page = mReq->req.dma + i * CI13XXX_PAGE_SIZE;
434 page &= ~TD_RESERVED_MASK; 434 page &= ~TD_RESERVED_MASK;
435 mReq->ptr->page[i] = cpu_to_le32(page); 435 mReq->ptr->page[i] = cpu_to_le32(page);
@@ -676,7 +676,7 @@ static int _ep_queue(struct usb_ep *ep, struct usb_request *req,
676 return -EBUSY; 676 return -EBUSY;
677 } 677 }
678 678
679 if (req->length > 4 * CI13XXX_PAGE_SIZE) { 679 if (req->length > (TD_PAGE_COUNT - 1) * CI13XXX_PAGE_SIZE) {
680 dev_err(mEp->ci->dev, "request bigger than one td\n"); 680 dev_err(mEp->ci->dev, "request bigger than one td\n");
681 return -EMSGSIZE; 681 return -EMSGSIZE;
682 } 682 }