diff options
author | Robert Baldyga <r.baldyga@samsung.com> | 2014-02-20 03:26:25 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-03-05 10:44:49 -0500 |
commit | 0e06bcac79ce6bb49adee22a991206933b7ea52d (patch) | |
tree | ca865272f7cdf6024d552d5abae27fbf3ed9e7ed /drivers/usb/gadget/at91_udc.c | |
parent | 3f83e53878b9cb3314d76f957a497562ce508984 (diff) |
usb: gadget: at91_udc: fix ep maxpacket initialisation
This patch fixes problem with unnecessary usb_ep_set_maxpacket_limit() usage.
It should not be used in at91udc_probe() function, where maxpacket values are
set for field "maxpacket" of struct at91_ep, which is representation of
endpoint in driver internals. Function usb_ep_set_maxpacket_limit() is called
in udc_reinit() function, where struct usb_ep instances are initialised with
values set previously in struct at91_ep instances. So it's very important to
initialise it properly.
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/at91_udc.c')
-rw-r--r-- | drivers/usb/gadget/at91_udc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index cea8c20a1425..f605ad8c1902 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -1758,15 +1758,15 @@ static int at91udc_probe(struct platform_device *pdev) | |||
1758 | 1758 | ||
1759 | /* newer chips have more FIFO memory than rm9200 */ | 1759 | /* newer chips have more FIFO memory than rm9200 */ |
1760 | if (cpu_is_at91sam9260() || cpu_is_at91sam9g20()) { | 1760 | if (cpu_is_at91sam9260() || cpu_is_at91sam9g20()) { |
1761 | usb_ep_set_maxpacket_limit(&udc->ep[0].ep, 64); | 1761 | udc->ep[0].maxpacket = 64; |
1762 | usb_ep_set_maxpacket_limit(&udc->ep[3].ep, 64); | 1762 | udc->ep[3].maxpacket = 64; |
1763 | usb_ep_set_maxpacket_limit(&udc->ep[4].ep, 512); | 1763 | udc->ep[4].maxpacket = 512; |
1764 | usb_ep_set_maxpacket_limit(&udc->ep[5].ep, 512); | 1764 | udc->ep[5].maxpacket = 512; |
1765 | } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) { | 1765 | } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) { |
1766 | usb_ep_set_maxpacket_limit(&udc->ep[3].ep, 64); | 1766 | udc->ep[3].maxpacket = 64; |
1767 | } else if (cpu_is_at91sam9263()) { | 1767 | } else if (cpu_is_at91sam9263()) { |
1768 | usb_ep_set_maxpacket_limit(&udc->ep[0].ep, 64); | 1768 | udc->ep[0].maxpacket = 64; |
1769 | usb_ep_set_maxpacket_limit(&udc->ep[3].ep, 64); | 1769 | udc->ep[3].maxpacket = 64; |
1770 | } | 1770 | } |
1771 | 1771 | ||
1772 | udc->udp_baseaddr = ioremap(res->start, resource_size(res)); | 1772 | udc->udp_baseaddr = ioremap(res->start, resource_size(res)); |