From 3691a59d5fe394a2d9999dc54cc4ecf0ec5ba7ae Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Tue, 12 Oct 2010 10:37:59 +0100 Subject: [PATCH] --- yaml --- r: 211478 b: refs/heads/master c: 10d48b3934940c178635413b5128c33bc17abe1d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ep93xx/dma-m2p.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 892ed66e7e25..5c817159837f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0bb5862a9076992e2cbeb5fa0d08c2ac3d4fbb0 +refs/heads/master: 10d48b3934940c178635413b5128c33bc17abe1d diff --git a/trunk/arch/arm/mach-ep93xx/dma-m2p.c b/trunk/arch/arm/mach-ep93xx/dma-m2p.c index 8904ca4e2e24..a696d354b1f8 100644 --- a/trunk/arch/arm/mach-ep93xx/dma-m2p.c +++ b/trunk/arch/arm/mach-ep93xx/dma-m2p.c @@ -276,7 +276,7 @@ static void channel_disable(struct m2p_channel *ch) v &= ~(M2P_CONTROL_STALL_IRQ_EN | M2P_CONTROL_NFB_IRQ_EN); m2p_set_control(ch, v); - while (m2p_channel_state(ch) == STATE_ON) + while (m2p_channel_state(ch) >= STATE_ON) cpu_relax(); m2p_set_control(ch, 0x0);