Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71174
b: refs/heads/master
c: 902749c
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Walker authored and Linus Torvalds committed Oct 18, 2007
1 parent 4d815ba commit 0694797
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9ce34218a8b63594c8958b5a4ef8cce24d511e1b
refs/heads/master: 902749cdbd3da8199e57d082f36a6de60591aeb6
8 changes: 4 additions & 4 deletions trunk/kernel/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <asm/dma.h>
#include <asm/system.h>



/* A note on resource allocation:
*
Expand Down Expand Up @@ -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 */

Expand All @@ -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;
Expand Down

0 comments on commit 0694797

Please sign in to comment.