summaryrefslogtreecommitdiff
path: root/drivers/dma
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-11-18 01:17:44 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-12-06 23:59:40 +0100
commit12dab4ce85a7dc2cb2e4d813696ed47ed44fb24e (patch)
tree358f46f9f70d6b772114b64493ae35c2cc919a7f /drivers/dma
parent55723954829f30cf148924ee55d10b1662551edc (diff)
downloadu-boot-imx-12dab4ce85a7dc2cb2e4d813696ed47ed44fb24e.zip
u-boot-imx-12dab4ce85a7dc2cb2e4d813696ed47ed44fb24e.tar.gz
u-boot-imx-12dab4ce85a7dc2cb2e4d813696ed47ed44fb24e.tar.bz2
apbh_dma: return error value on timeout
When a timeout occurs, the return value is prepared but never returned. Fix that. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Marek Vasut <marek.vasut@gmail.com> Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/apbh_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 69a1042..4000974 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -606,7 +606,7 @@ int mxs_dma_wait_complete(uint32_t timeout, unsigned int chan)
mxs_dma_reset(chan);
}
- return 0;
+ return ret;
}
/*