- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / arch / arm / plat-s3c24xx / dma.c

diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index f046f8c..f0ea794 100644 (file)
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/plat-s3c24xx/dma.c
  *
- * Copyright (c) 2003-2005,2006 Simtec Electronics
+ * Copyright 2003-2006 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
  *
  * S3C2410 DMA core
@@ -1310,7 +1310,7 @@ int __init s3c24xx_dma_init(unsigned int channels, unsigned int irq,
        int channel;
        int ret;
 
-       printk("S3C24XX DMA Driver, (c) 2003-2004,2006 Simtec Electronics\n");
+       printk("S3C24XX DMA Driver, Copyright 2003-2006 Simtec Electronics\n");
 
        dma_channels = channels;
 
@@ -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;
                        }
                }