diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-03 15:23:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-03 18:22:18 -0700 |
| commit | 7fe7b2f4ec14d6517078c5bc32b04301b468041c (patch) | |
| tree | ded474f209ad27a57bef37c7064985b5a422c1f9 | |
| parent | 09b05f5ee04cd2e2af3384d50646f53c76712f10 (diff) | |
| download | linux-7fe7b2f4ec14d6517078c5bc32b04301b468041c.tar.gz linux-7fe7b2f4ec14d6517078c5bc32b04301b468041c.tar.bz2 linux-7fe7b2f4ec14d6517078c5bc32b04301b468041c.zip | |
dw_dmac: fix copy/paste bug in tasklet
The tasklet checks RAW.BLOCK twice, and does not check RAW.XFER. This is
obviously wrong, and could theoretically cause the driver to hang.
Reported-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -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) int i; status_block = dma_readl(dw, RAW.BLOCK); - status_xfer = dma_readl(dw, RAW.BLOCK); + status_xfer = dma_readl(dw, RAW.XFER); status_err = dma_readl(dw, RAW.ERROR); dev_vdbg(dw->dma.dev, "tasklet: status_block=%x status_err=%x\n", |