From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Tue, 22 Nov 2011 08:52:35 +0100 Subject: [U-Boot] [PATCH] apbh_dma: return error value on timeout In-Reply-To: <1321615064-18100-1-git-send-email-w.sang@pengutronix.de> References: <1321615064-18100-1-git-send-email-w.sang@pengutronix.de> Message-ID: <4ECB54C3.9020108@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 18/11/2011 12:17, Wolfram Sang wrote: > When a timeout occurs, the return value is prepared but never returned. > Fix that. > > Signed-off-by: Uwe Kleine-K?nig > Signed-off-by: Wolfram Sang > Cc: Marek Vasut > --- > drivers/dma/apbh_dma.c | 2 +- > 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; > } Acked-by: Stefano Babic Applied to u-boot-imx, thanks. Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================