diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /drivers/usb/musb/musb_host.c | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (diff) | |
| parent | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (diff) | |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'drivers/usb/musb/musb_host.c')
| -rw-r--r-- | drivers/usb/musb/musb_host.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 60ddba8066ea..79cb0af779fa 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c | |||
| @@ -774,6 +774,10 @@ static void musb_ep_program(struct musb *musb, u8 epnum, | |||
| 774 | if (musb->double_buffer_not_ok) | 774 | if (musb->double_buffer_not_ok) |
| 775 | musb_writew(epio, MUSB_TXMAXP, | 775 | musb_writew(epio, MUSB_TXMAXP, |
| 776 | hw_ep->max_packet_sz_tx); | 776 | hw_ep->max_packet_sz_tx); |
| 777 | else if (can_bulk_split(musb, qh->type)) | ||
| 778 | musb_writew(epio, MUSB_TXMAXP, packet_sz | ||
| 779 | | ((hw_ep->max_packet_sz_tx / | ||
| 780 | packet_sz) - 1) << 11); | ||
| 777 | else | 781 | else |
| 778 | musb_writew(epio, MUSB_TXMAXP, | 782 | musb_writew(epio, MUSB_TXMAXP, |
| 779 | qh->maxpacket | | 783 | qh->maxpacket | |