From bc32a149c0e342b2b4d69947cc86b5821ca470b1 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Fri, 28 Jun 2013 19:20:32 +0800 Subject: ENGR00268944-2 dma: imx-sdma: Extend waiting timeout for channel 0 irq 500us would be too short for some extreme cases, so we here keep it same as Kernel 3.0.35 did, using 1sec timeout. Signed-off-by: Nicolin Chen (cherry picked from commit cfb9d8a8c7004e9689b4e7eddebb6bd946ef4d66) --- drivers/dma/imx-sdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 1cd04a19890f..8318c1d53a8d 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -424,7 +424,7 @@ static int sdma_run_channel0(struct sdma_engine *sdma) while (!(ret = readl_relaxed(sdma->regs + SDMA_H_INTR) & 1)) { if (timeout-- <= 0) break; - udelay(1); + mdelay(2); } if (ret) { -- cgit v1.2.3