dmaengine: i.MX: Fix merge of cookie branch.
authorJavier Martin <javier.martin@vista-silicon.com>
Thu, 22 Mar 2012 13:54:15 +0000 (14:54 +0100)
committerVinod Koul <vinod.koul@linux.intel.com>
Mon, 26 Mar 2012 06:01:32 +0000 (11:31 +0530)
commit660cd0dd94eba5201c69cd10f2d2fefb52807fa8
tree227318217703120f49de136c659cba84109a22d9
parentf606ab897b6d7f35b57c7474424676e30457520b
dmaengine: i.MX: Fix merge of cookie branch.

When merging DMA cookie changes a small chunk
of code was dropped. This broke imx-dma driver.

This patch adds this chunk again and fixes the problem.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
drivers/dma/imx-dma.c