projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5572395
)
apbh_dma: return error value on timeout
author
Wolfram Sang
<w.sang@pengutronix.de>
Fri, 18 Nov 2011 01:17:44 +0000
(
01:17
+0000)
committer
Albert ARIBAUD
<albert.u.boot@aribaud.net>
Tue, 6 Dec 2011 22:59:40 +0000
(23:59 +0100)
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>
drivers/dma/apbh_dma.c
patch
|
blob
|
history
diff --git
a/drivers/dma/apbh_dma.c
b/drivers/dma/apbh_dma.c
index 69a10428ef241581a44bf0cd9436acb1987d3e99..40009744835466ce4db299e4972f3b26ba8600ff 100644
(file)
--- 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
;
}
/*