diff options
| author | Nicolin Chen <b42378@freescale.com> | 2013-06-28 19:20:32 +0800 |
|---|---|---|
| committer | Nicolin Chen <b42378@freescale.com> | 2013-06-28 20:29:06 +0800 |
| commit | bc32a149c0e342b2b4d69947cc86b5821ca470b1 (patch) | |
| tree | 91cedf65c14b7f3c3ebe4953f1657f6162559f2b | |
| parent | 4ff49264357050d640191b1ca6710b4ad94cc651 (diff) | |
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 <b42378@freescale.com>
(cherry picked from commit cfb9d8a8c7004e9689b4e7eddebb6bd946ef4d66)
| -rw-r--r-- | drivers/dma/imx-sdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |