Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[linux-2.6-block.git] / drivers / dma / coh901318.c

diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index a2f079aca550b4e0b3fb6ecb3db2fcec53c89a24..797940e532ff71dbf9a53000f4bfb65017b79433 100644 (file)
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -2355,7 +2355,9 @@ coh901318_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
        enum dma_status ret;
 
        ret = dma_cookie_status(chan, cookie, txstate);
-       /* FIXME: should be conditional on ret != DMA_SUCCESS? */
+       if (ret == DMA_SUCCESS)
+               return ret;
+
        dma_set_residue(txstate, coh901318_get_bytes_left(chan));
 
        if (ret == DMA_IN_PROGRESS && cohc->stopped)