aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Zhang <zhangwm@marvell.com>2011-10-12 04:49:32 -0400
committerFelipe Balbi <balbi@ti.com>2011-10-13 13:42:04 -0400
commit615268b05f6c719f5151c351022aa79ab73a0898 (patch)
tree679141b19c5fc58165cf5496a77c18c273f09ccd
parent27cec2b2f7a4d2394af63a3dc7928975f4c072f4 (diff)
usb: gadget: mv_udc: set unused endpoint with right type
According to the comment right above the code, we should use USB_ENDPOINT_XFER_BULK instead. Signed-off-by: Neil Zhang <zhangwm@marvell.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/mv_udc_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index 501b05a253cc..16bfcb919a72 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -590,14 +590,14 @@ static int mv_ep_enable(struct usb_ep *_ep,
590 */ 590 */
591 epctrlx = readl(&udc->op_regs->epctrlx[ep->ep_num]); 591 epctrlx = readl(&udc->op_regs->epctrlx[ep->ep_num]);
592 if ((epctrlx & EPCTRL_RX_ENABLE) == 0) { 592 if ((epctrlx & EPCTRL_RX_ENABLE) == 0) {
593 epctrlx |= ((desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) 593 epctrlx |= (USB_ENDPOINT_XFER_BULK
594 << EPCTRL_RX_EP_TYPE_SHIFT); 594 << EPCTRL_RX_EP_TYPE_SHIFT);
595 writel(epctrlx, &udc->op_regs->epctrlx[ep->ep_num]); 595 writel(epctrlx, &udc->op_regs->epctrlx[ep->ep_num]);
596 } 596 }
597 597
598 epctrlx = readl(&udc->op_regs->epctrlx[ep->ep_num]); 598 epctrlx = readl(&udc->op_regs->epctrlx[ep->ep_num]);
599 if ((epctrlx & EPCTRL_TX_ENABLE) == 0) { 599 if ((epctrlx & EPCTRL_TX_ENABLE) == 0) {
600 epctrlx |= ((desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) 600 epctrlx |= (USB_ENDPOINT_XFER_BULK
601 << EPCTRL_TX_EP_TYPE_SHIFT); 601 << EPCTRL_TX_EP_TYPE_SHIFT);
602 writel(epctrlx, &udc->op_regs->epctrlx[ep->ep_num]); 602 writel(epctrlx, &udc->op_regs->epctrlx[ep->ep_num]);
603 } 603 }