projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[powerpc.git]
/
arch
/
arm
/
mach-s3c2410
/
dma.c
diff --git
a/arch/arm/mach-s3c2410/dma.c
b/arch/arm/mach-s3c2410/dma.c
index
bc229fa
..
c7c2889
100644
(file)
--- a/
arch/arm/mach-s3c2410/dma.c
+++ b/
arch/arm/mach-s3c2410/dma.c
@@
-785,6
+785,10
@@
int s3c2410_dma_free(dmach_t channel, s3c2410_dma_client_t *client)
chan->client = NULL;
chan->in_use = 0;
+ if (chan->irq_claimed)
+ free_irq(chan->irq, (void *)chan);
+ chan->irq_claimed = 0;
+
local_irq_restore(flags);
return 0;