From: Wolfram Sang <w.sang@pengutronix.de>
Date: Fri, 18 Nov 2011 01:17:44 +0000 (+0000)
Subject: apbh_dma: return error value on timeout
X-Git-Tag: v2011.12-rc1~60^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=12dab4ce85a7dc2cb2e4d813696ed47ed44fb24e;p=oweals%2Fu-boot.git

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>
---

diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index 69a10428ef..4000974483 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;
 }
 
 /*