[U-Boot] apbh_dma: return error value on timeout

Submitted by Wolfram Sang on Nov. 18, 2011, 11:17 a.m.

Details

Message ID 1321615064-18100-1-git-send-email-w.sang@pengutronix.de
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Wolfram Sang Nov. 18, 2011, 11:17 a.m.
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>
---
 drivers/dma/apbh_dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Stefano Babic Nov. 22, 2011, 7:52 a.m.
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 <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> ---
>  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 <sbabic@denx.de>

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Patch hide | download patch | download mbox

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;
 }
 
 /*