diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-09-23 09:55:59 -0400 |
---|---|---|
committer | Jesper Nilsson <jespern@axis.com> | 2016-09-23 10:00:04 -0400 |
commit | a85f305f6e4e4055ac1f43e18a96417bcd146d45 (patch) | |
tree | 6a108cd5231e6871bd2a28b06c4148a3fd1c0325 | |
parent | e1ae7ed216981c2271b672d4f0eb4213e63df7ff (diff) |
CRIS v32: remove some double unlocks
We unlocked a few lines earlier so we can delete these unlocks.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jesper Nilsson <jespern@axis.com>
-rw-r--r-- | arch/cris/arch-v32/mach-a3/dma.c | 1 | ||||
-rw-r--r-- | arch/cris/arch-v32/mach-fs/dma.c | 1 |
2 files changed, 0 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, | |||
41 | 41 | ||
42 | if (options & DMA_PANIC_ON_ERROR) | 42 | if (options & DMA_PANIC_ON_ERROR) |
43 | panic("request_dma error!"); | 43 | panic("request_dma error!"); |
44 | spin_unlock_irqrestore(&dma_lock, flags); | ||
45 | return -EBUSY; | 44 | return -EBUSY; |
46 | } | 45 | } |
47 | clk_ctrl = REG_RD(clkgen, regi_clkgen, rw_clk_ctrl); | 46 | clk_ctrl = REG_RD(clkgen, regi_clkgen, rw_clk_ctrl); |
diff --git a/arch/cris/arch-v32/mach-fs/dma.c b/arch/cris/arch-v32/mach-fs/dma.c index fc6416a671ea..7c93679c02ad 100644 --- a/arch/cris/arch-v32/mach-fs/dma.c +++ b/arch/cris/arch-v32/mach-fs/dma.c | |||
@@ -43,7 +43,6 @@ int crisv32_request_dma(unsigned int dmanr, const char *device_id, | |||
43 | } | 43 | } |
44 | if (options & DMA_PANIC_ON_ERROR) | 44 | if (options & DMA_PANIC_ON_ERROR) |
45 | panic("request_dma error!"); | 45 | panic("request_dma error!"); |
46 | spin_unlock_irqrestore(&dma_lock, flags); | ||
47 | return -EBUSY; | 46 | return -EBUSY; |
48 | } | 47 | } |
49 | clk_ctrl = REG_RD(config, regi_config, rw_clk_ctrl); | 48 | clk_ctrl = REG_RD(config, regi_config, rw_clk_ctrl); |