Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f44b92f4 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dma: dw_dmac: check direction properly in dw_dma_cyclic_prep 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 0e7264cc

drivers/dma/dw_dmac.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1355,6 +1355,9 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan, 




	retval = ERR_PTR(-EINVAL);

	retval = ERR_PTR(-EINVAL);





	if (unlikely(!is_slave_direction(direction)))

		goto out_err;



	if (direction == DMA_MEM_TO_DEV)

	if (direction == DMA_MEM_TO_DEV)

		reg_width = __ffs(sconfig->dst_addr_width);

		reg_width = __ffs(sconfig->dst_addr_width);

	else

	else
@@ -1369,8 +1372,6 @@ struct dw_cyclic_desc *dw_dma_cyclic_prep(struct dma_chan *chan, 
		goto out_err;

		goto out_err;

	if (unlikely(buf_addr & ((1 << reg_width) - 1)))

	if (unlikely(buf_addr & ((1 << reg_width) - 1)))

		goto out_err;

		goto out_err;

	if (unlikely(!(direction & (DMA_MEM_TO_DEV | DMA_DEV_TO_MEM))))

		goto out_err;





	retval = ERR_PTR(-ENOMEM);

	retval = ERR_PTR(-ENOMEM);