diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-08 18:17:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-08 18:17:25 -0400 |
| commit | cdbb92b31d3c465aa96bd09f2d42c39b87b32bee (patch) | |
| tree | 370e29681529882d7e4c766a19f0612885583464 /drivers/dma/dw_dmac.c | |
| parent | 2ec2b482b10a1ed3493c224f1893cddd3d33833b (diff) | |
| parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'drivers/dma/dw_dmac.c')
| -rw-r--r-- | drivers/dma/dw_dmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index 94df91771243..0778d99aea7c 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c | |||
| @@ -364,7 +364,7 @@ static void dw_dma_tasklet(unsigned long data) | |||
| 364 | int i; | 364 | int i; |
| 365 | 365 | ||
| 366 | status_block = dma_readl(dw, RAW.BLOCK); | 366 | status_block = dma_readl(dw, RAW.BLOCK); |
| 367 | status_xfer = dma_readl(dw, RAW.BLOCK); | 367 | status_xfer = dma_readl(dw, RAW.XFER); |
| 368 | status_err = dma_readl(dw, RAW.ERROR); | 368 | status_err = dma_readl(dw, RAW.ERROR); |
| 369 | 369 | ||
| 370 | dev_vdbg(dw->dma.dev, "tasklet: status_block=%x status_err=%x\n", | 370 | dev_vdbg(dw->dma.dev, "tasklet: status_block=%x status_err=%x\n", |