diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2010-08-09 14:08:41 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-09-22 23:53:46 +0200 |
| commit | 9dbfbd35ce16e4f5a4d0d9e3f6e012b136fe80ea (patch) | |
| tree | 343750610afe11e4637a450bba74ec6a9106e733 /drivers/dma | |
| parent | DMAENGINE: ste_dma40: code clean-up (diff) | |
| download | linux-9dbfbd35ce16e4f5a4d0d9e3f6e012b136fe80ea.tar.xz linux-9dbfbd35ce16e4f5a4d0d9e3f6e012b136fe80ea.zip | |
DMAENGINE: ste_dma40: corrected is_paused behavior
The handling of pause detection was slightly incorrect.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/ste_dma40.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 7a4919bf1e92..2b209fa004ba 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1521,16 +1521,22 @@ static bool d40_is_paused(struct d40_chan *d40c) } if (d40c->dma_cfg.dir == STEDMA40_MEM_TO_PERIPH || - d40c->dma_cfg.dir == STEDMA40_MEM_TO_MEM) + d40c->dma_cfg.dir == STEDMA40_MEM_TO_MEM) { event = D40_TYPE_TO_EVENT(d40c->dma_cfg.dst_dev_type); - else if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM) + status = readl(d40c->base->virtbase + D40_DREG_PCBASE + + d40c->phy_chan->num * D40_DREG_PCDELTA + + D40_CHAN_REG_SDLNK); + } else if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM) { event = D40_TYPE_TO_EVENT(d40c->dma_cfg.src_dev_type); - else { + status = readl(d40c->base->virtbase + D40_DREG_PCBASE + + d40c->phy_chan->num * D40_DREG_PCDELTA + + D40_CHAN_REG_SSLNK); + } else { dev_err(&d40c->chan.dev->device, "[%s] Unknown direction\n", __func__); goto _exit; } - status = d40_chan_has_events(d40c); + status = (status & D40_EVENTLINE_MASK(event)) >> D40_EVENTLINE_POS(event); |