Merge branch 'for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / dma / sun4i-dma.c

diff --git a/drivers/dma/sun4i-dma.c b/drivers/dma/sun4i-dma.c
index e0df233dde929b4fc5390104ed9b3227d3bd663e..57aa227bfadb3eae97cb348372cacdf6eafc4586 100644 (file)
--- a/drivers/dma/sun4i-dma.c
+++ b/drivers/dma/sun4i-dma.c
@@ -461,25 +461,25 @@ generate_ndma_promise(struct dma_chan *chan, dma_addr_t src, dma_addr_t dest,
 
        /* Source burst */
        ret = convert_burst(sconfig->src_maxburst);
-       if (IS_ERR_VALUE(ret))
+       if (ret < 0)
                goto fail;
        promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret);
 
        /* Destination burst */
        ret = convert_burst(sconfig->dst_maxburst);
-       if (IS_ERR_VALUE(ret))
+       if (ret < 0)
                goto fail;
        promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret);
 
        /* Source bus width */
        ret = convert_buswidth(sconfig->src_addr_width);
-       if (IS_ERR_VALUE(ret))
+       if (ret < 0)
                goto fail;
        promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret);
 
        /* Destination bus width */
        ret = convert_buswidth(sconfig->dst_addr_width);
-       if (IS_ERR_VALUE(ret))
+       if (ret < 0)
                goto fail;
        promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret);
 
@@ -518,25 +518,25 @@ generate_ddma_promise(struct dma_chan *chan, dma_addr_t src, dma_addr_t dest,
 
        /* Source burst */
        ret = convert_burst(sconfig->src_maxburst);
-       if (IS_ERR_VALUE(ret))
+       if (ret < 0)
                goto fail;
        promise->cfg |= SUN4I_DMA_CFG_SRC_BURST_LENGTH(ret);
 
        /* Destination burst */
        ret = convert_burst(sconfig->dst_maxburst);
-       if (IS_ERR_VALUE(ret))
+       if (ret < 0)
                goto fail;
        promise->cfg |= SUN4I_DMA_CFG_DST_BURST_LENGTH(ret);
 
        /* Source bus width */
        ret = convert_buswidth(sconfig->src_addr_width);
-       if (IS_ERR_VALUE(ret))
+       if (ret < 0)
                goto fail;
        promise->cfg |= SUN4I_DMA_CFG_SRC_DATA_WIDTH(ret);
 
        /* Destination bus width */
        ret = convert_buswidth(sconfig->dst_addr_width);
-       if (IS_ERR_VALUE(ret))
+       if (ret < 0)
                goto fail;
        promise->cfg |= SUN4I_DMA_CFG_DST_DATA_WIDTH(ret);