diff options
Diffstat (limited to 'drivers/usb/gadget/pch_udc.c')
-rw-r--r-- | drivers/usb/gadget/pch_udc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c index f96615ab6b77..b69ae3eec687 100644 --- a/drivers/usb/gadget/pch_udc.c +++ b/drivers/usb/gadget/pch_udc.c | |||
@@ -947,7 +947,7 @@ static void pch_udc_ep_enable(struct pch_udc_ep *ep, | |||
947 | else | 947 | else |
948 | buff_size = UDC_EPOUT_BUFF_SIZE; | 948 | buff_size = UDC_EPOUT_BUFF_SIZE; |
949 | pch_udc_ep_set_bufsz(ep, buff_size, ep->in); | 949 | pch_udc_ep_set_bufsz(ep, buff_size, ep->in); |
950 | pch_udc_ep_set_maxpkt(ep, le16_to_cpu(desc->wMaxPacketSize)); | 950 | pch_udc_ep_set_maxpkt(ep, usb_endpoint_maxp(desc)); |
951 | pch_udc_ep_set_nak(ep); | 951 | pch_udc_ep_set_nak(ep); |
952 | pch_udc_ep_fifo_flush(ep, ep->in); | 952 | pch_udc_ep_fifo_flush(ep, ep->in); |
953 | /* Configure the endpoint */ | 953 | /* Configure the endpoint */ |
@@ -957,7 +957,7 @@ static void pch_udc_ep_enable(struct pch_udc_ep *ep, | |||
957 | (cfg->cur_cfg << UDC_CSR_NE_CFG_SHIFT) | | 957 | (cfg->cur_cfg << UDC_CSR_NE_CFG_SHIFT) | |
958 | (cfg->cur_intf << UDC_CSR_NE_INTF_SHIFT) | | 958 | (cfg->cur_intf << UDC_CSR_NE_INTF_SHIFT) | |
959 | (cfg->cur_alt << UDC_CSR_NE_ALT_SHIFT) | | 959 | (cfg->cur_alt << UDC_CSR_NE_ALT_SHIFT) | |
960 | le16_to_cpu(desc->wMaxPacketSize) << UDC_CSR_NE_MAX_PKT_SHIFT; | 960 | usb_endpoint_maxp(desc) << UDC_CSR_NE_MAX_PKT_SHIFT; |
961 | 961 | ||
962 | if (ep->in) | 962 | if (ep->in) |
963 | pch_udc_write_csr(ep->dev, val, UDC_EPIN_IDX(ep->num)); | 963 | pch_udc_write_csr(ep->dev, val, UDC_EPIN_IDX(ep->num)); |
@@ -1466,7 +1466,7 @@ static int pch_udc_pcd_ep_enable(struct usb_ep *usbep, | |||
1466 | ep->desc = desc; | 1466 | ep->desc = desc; |
1467 | ep->halted = 0; | 1467 | ep->halted = 0; |
1468 | pch_udc_ep_enable(ep, &ep->dev->cfg_data, desc); | 1468 | pch_udc_ep_enable(ep, &ep->dev->cfg_data, desc); |
1469 | ep->ep.maxpacket = le16_to_cpu(desc->wMaxPacketSize); | 1469 | ep->ep.maxpacket = usb_endpoint_maxp(desc); |
1470 | pch_udc_enable_ep_interrupts(ep->dev, PCH_UDC_EPINT(ep->in, ep->num)); | 1470 | pch_udc_enable_ep_interrupts(ep->dev, PCH_UDC_EPINT(ep->in, ep->num)); |
1471 | spin_unlock_irqrestore(&dev->lock, iflags); | 1471 | spin_unlock_irqrestore(&dev->lock, iflags); |
1472 | return 0; | 1472 | return 0; |