diff --git a/[refs] b/[refs] index 2b0d689a9cd2..2c7cf525f922 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ce34218a8b63594c8958b5a4ef8cce24d511e1b +refs/heads/master: 902749cdbd3da8199e57d082f36a6de60591aeb6 diff --git a/trunk/kernel/dma.c b/trunk/kernel/dma.c index 937b13ca33ba..6a82bb716dac 100644 --- a/trunk/kernel/dma.c +++ b/trunk/kernel/dma.c @@ -20,7 +20,7 @@ #include #include - + /* A note on resource allocation: * @@ -95,7 +95,7 @@ void free_dma(unsigned int dmanr) if (xchg(&dma_chan_busy[dmanr].lock, 0) == 0) { printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr); return; - } + } } /* free_dma */ @@ -121,8 +121,8 @@ static int proc_dma_show(struct seq_file *m, void *v) for (i = 0 ; i < MAX_DMA_CHANNELS ; i++) { if (dma_chan_busy[i].lock) { - seq_printf(m, "%2d: %s\n", i, - dma_chan_busy[i].device_id); + seq_printf(m, "%2d: %s\n", i, + dma_chan_busy[i].device_id); } } return 0;