summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2012-10-30 15:21:14 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-31 08:36:51 +0100
commit359a6eb6d3058bc9f73fc17c9d0b4264ad710e3e (patch)
tree3f8afdbee39120875972c88273f417373ffbb909 /drivers/dma
parentc2ae23e9dfdf4b2016b59f320f1222e5fd3daf9a (diff)
downloadbarebox-359a6eb6d3058bc9f73fc17c9d0b4264ad710e3e.tar.gz
dma: apbh: check for errors when resetting ip core
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/apbh_dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 363878f..d30b8fb 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -555,7 +555,9 @@ int mxs_dma_init(void)
int ret, channel;
u32 val, reg;
- mxs_reset_block(apbh_regs, 0);
+ ret = mxs_reset_block(apbh_regs, 0);
+ if (ret)
+ return ret;
/* HACK: Get CPUID and determine APBH version */
val = readl(0x8001c310) >> 16;