projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...
[cascardo/linux.git]
/
arch
/
cris
/
arch-v32
/
mach-a3
/
dma.c
diff --git
a/arch/cris/arch-v32/mach-a3/dma.c
b/arch/cris/arch-v32/mach-a3/dma.c
index
47c64bf
..
11f417f
100644
(file)
--- a/
arch/cris/arch-v32/mach-a3/dma.c
+++ b/
arch/cris/arch-v32/mach-a3/dma.c
@@
-41,7
+41,6
@@
int crisv32_request_dma(unsigned int dmanr, const char *device_id,
if (options & DMA_PANIC_ON_ERROR)
panic("request_dma error!");
- spin_unlock_irqrestore(&dma_lock, flags);
return -EBUSY;
}
clk_ctrl = REG_RD(clkgen, regi_clkgen, rw_clk_ctrl);