diff options
| author | Jens Axboe | 2009-12-03 13:49:39 +0100 |
|---|---|---|
| committer | Jens Axboe | 2009-12-03 13:49:39 +0100 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /drivers/usb/musb/cppi_dma.c | |
| parent | cfq-iosched: no dispatch limit for single queue (diff) | |
| parent | Linux 2.6.32 (diff) | |
| download | kernel-qcow2-linux-220d0b1dbf78c6417a658c96e571415552d3abac.tar.gz kernel-qcow2-linux-220d0b1dbf78c6417a658c96e571415552d3abac.tar.xz kernel-qcow2-linux-220d0b1dbf78c6417a658c96e571415552d3abac.zip | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/usb/musb/cppi_dma.c')
| -rw-r--r-- | drivers/usb/musb/cppi_dma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index c3577bbbae6c..ef2332a9941d 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c @@ -1442,11 +1442,6 @@ static int cppi_channel_abort(struct dma_channel *channel) musb_writew(regs, MUSB_TXCSR, value); musb_writew(regs, MUSB_TXCSR, value); - /* re-enable interrupt */ - if (enabled) - musb_writel(tibase, DAVINCI_TXCPPI_INTENAB_REG, - (1 << cppi_ch->index)); - /* While we scrub the TX state RAM, ensure that we clean * up any interrupt that's currently asserted: * 1. Write to completion Ptr value 0x1(bit 0 set) @@ -1459,6 +1454,11 @@ static int cppi_channel_abort(struct dma_channel *channel) cppi_reset_tx(tx_ram, 1); musb_writel(&tx_ram->tx_complete, 0, 0); + /* re-enable interrupt */ + if (enabled) + musb_writel(tibase, DAVINCI_TXCPPI_INTENAB_REG, + (1 << cppi_ch->index)); + cppi_dump_tx(5, cppi_ch, " (done teardown)"); /* REVISIT tx side _should_ clean up the same way |