dma: dw_dmac: check direction properly in dw_dma_cyclic_prep
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 10 Jan 2013 08:52:58 +0000 (10:52 +0200)
committerVinod Koul <vinod.koul@intel.com>
Sat, 12 Jan 2013 13:07:21 +0000 (05:07 -0800)
dma_transfer_direction is a normal enum. It means we can't usually use the
values as bit fields. Let's adjust this check and move it above the usage of
the direction parameter, due to the nature of the following usage of it.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/dw_dmac.c

index 6c9e20a..ca996bc 100644 (file)
@@ -1355,6 +1355,9 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
 
        retval = ERR_PTR(-EINVAL);
 
+       if (unlikely(!is_slave_direction(direction)))
+               goto out_err;
+
        if (direction == DMA_MEM_TO_DEV)
                reg_width = __ffs(sconfig->dst_addr_width);
        else
@@ -1369,8 +1372,6 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan,
                goto out_err;
        if (unlikely(buf_addr & ((1 << reg_width) - 1)))
                goto out_err;
-       if (unlikely(!(direction & (DMA_MEM_TO_DEV | DMA_DEV_TO_MEM))))
-               goto out_err;
 
        retval = ERR_PTR(-ENOMEM);