From 4be7617ed497a81893337c0954b7ae56c2afdcf7 Mon Sep 17 00:00:00 2001 From: Ramax Lo Date: Tue, 8 Dec 2009 23:42:41 +0800 Subject: [PATCH] --- yaml --- r: 173843 b: refs/heads/master c: 947a2462792a89b8aa168a1108288e0d0ae36d12 h: refs/heads/master i: 173841: e4379a5d525715767bb68b5e63887000f87384c1 173839: 45a27ba6490abc39f1430319b24dc749a5cfbca6 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c24xx/dma.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5e700b3cd80e..2ae9f25204d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93b0d8c6b67b7d337509a36dbfcdb6d6eac1ef12 +refs/heads/master: 947a2462792a89b8aa168a1108288e0d0ae36d12 diff --git a/trunk/arch/arm/plat-s3c24xx/dma.c b/trunk/arch/arm/plat-s3c24xx/dma.c index f65192d5b1d7..f0ea7943ac5a 100644 --- a/trunk/arch/arm/plat-s3c24xx/dma.c +++ b/trunk/arch/arm/plat-s3c24xx/dma.c @@ -1403,11 +1403,13 @@ static struct s3c2410_dma_chan *s3c2410_dma_map_channel(int channel) ord = &dma_order->channels[channel]; for (ch = 0; ch < dma_channels; ch++) { + int tmp; if (!is_channel_valid(ord->list[ch])) continue; - if (s3c2410_chans[ord->list[ch]].in_use == 0) { - ch = ord->list[ch] & ~DMA_CH_VALID; + tmp = ord->list[ch] & ~DMA_CH_VALID; + if (s3c2410_chans[tmp].in_use == 0) { + ch = tmp; goto found; } }