summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-09-23 15:55:59 +0200
committerJesper Nilsson <jespern@axis.com>2016-09-23 16:00:04 +0200
commita85f305f6e4e4055ac1f43e18a96417bcd146d45 (patch)
tree6a108cd5231e6871bd2a28b06c4148a3fd1c0325
parente1ae7ed216981c2271b672d4f0eb4213e63df7ff (diff)
downloadop-kernel-dev-a85f305f6e4e4055ac1f43e18a96417bcd146d45.zip
op-kernel-dev-a85f305f6e4e4055ac1f43e18a96417bcd146d45.tar.gz
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.c1
-rw-r--r--arch/cris/arch-v32/mach-fs/dma.c1
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 47c64bf..11f417f 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-fs/dma.c b/arch/cris/arch-v32/mach-fs/dma.c
index fc6416a..7c93679 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,
}
if (options & DMA_PANIC_ON_ERROR)
panic("request_dma error!");
- spin_unlock_irqrestore(&dma_lock, flags);
return -EBUSY;
}
clk_ctrl = REG_RD(config, regi_config, rw_clk_ctrl);
OpenPOWER on IntegriCloud