diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-08 04:50:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-08 04:50:00 -0400 |
| commit | f066a155334642b8a206eec625b1925d88c48aeb (patch) | |
| tree | cb12975e60b70d1dae3b7397bab955de78a4d01e /drivers/usb/musb/cppi_dma.c | |
| parent | e7c064889606aab3569669078c69b87b2c527e72 (diff) | |
| parent | 33df4db04a79660150e1948e3296eeb451ac121b (diff) | |
Merge branch 'x86/urgent' into x86/xen
Conflicts:
arch/frv/include/asm/pgtable.h
arch/x86/include/asm/required-features.h
arch/x86/xen/mmu.c
Merge reason: x86/xen was on a .29 base still, move it to a fresher
branch and pick up Xen fixes as well, plus resolve
conflicts
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/musb/cppi_dma.c')
| -rw-r--r-- | drivers/usb/musb/cppi_dma.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index 569ef0fed0f6..1976e9b41800 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c | |||
| @@ -579,6 +579,7 @@ cppi_next_tx_segment(struct musb *musb, struct cppi_channel *tx) | |||
| 579 | * trigger the "send a ZLP?" confusion. | 579 | * trigger the "send a ZLP?" confusion. |
| 580 | */ | 580 | */ |
| 581 | rndis = (maxpacket & 0x3f) == 0 | 581 | rndis = (maxpacket & 0x3f) == 0 |
| 582 | && length > maxpacket | ||
| 582 | && length < 0xffff | 583 | && length < 0xffff |
| 583 | && (length % maxpacket) != 0; | 584 | && (length % maxpacket) != 0; |
| 584 | 585 | ||
| @@ -1228,27 +1229,7 @@ void cppi_completion(struct musb *musb, u32 rx, u32 tx) | |||
| 1228 | 1229 | ||
| 1229 | hw_ep = tx_ch->hw_ep; | 1230 | hw_ep = tx_ch->hw_ep; |
| 1230 | 1231 | ||
| 1231 | /* Peripheral role never repurposes the | 1232 | musb_dma_completion(musb, index + 1, 1); |
| 1232 | * endpoint, so immediate completion is | ||
| 1233 | * safe. Host role waits for the fifo | ||
| 1234 | * to empty (TXPKTRDY irq) before going | ||
| 1235 | * to the next queued bulk transfer. | ||
| 1236 | */ | ||
| 1237 | if (is_host_active(cppi->musb)) { | ||
| 1238 | #if 0 | ||
| 1239 | /* WORKAROUND because we may | ||
| 1240 | * not always get TXKPTRDY ... | ||
| 1241 | */ | ||
| 1242 | int csr; | ||
| 1243 | |||
| 1244 | csr = musb_readw(hw_ep->regs, | ||
| 1245 | MUSB_TXCSR); | ||
| 1246 | if (csr & MUSB_TXCSR_TXPKTRDY) | ||
| 1247 | #endif | ||
| 1248 | completed = false; | ||
| 1249 | } | ||
| 1250 | if (completed) | ||
| 1251 | musb_dma_completion(musb, index + 1, 1); | ||
| 1252 | 1233 | ||
| 1253 | } else { | 1234 | } else { |
| 1254 | /* Bigger transfer than we could fit in | 1235 | /* Bigger transfer than we could fit in |