diff options
Diffstat (limited to 'arch/cris/arch-v32/mach-a3')
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/dma.c | 1 | ||||
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/dram_init.S | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/mach-a3/dma.c b/arch/cris/arch-v32/mach-a3/dma.c index 47c64bf40eae..11f417f4da98 100644 --- 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); diff --git a/arch/cris/arch-v32/mach-a3/dram_init.S b/arch/cris/arch-v32/mach-a3/dram_init.S index 5c4f24dce94c..7dc26bdb26b5 100644 --- a/arch/cris/arch-v32/mach-a3/dram_init.S +++ b/arch/cris/arch-v32/mach-a3/dram_init.S @@ -3,7 +3,7 @@ * This file is intended to be included from other assembler files * * Note: This file may not modify r8 or r9 because they are used to - * carry information from the decompresser to the kernel + * carry information from the decompressor to the kernel * * Copyright (C) 2005-2007 Axis Communications AB * |