* [U-Boot] [PATCH] apbh_dma: return error value on timeout
@ 2011-11-18 11:17 Wolfram Sang
2011-11-22 7:52 ` Stefano Babic
0 siblings, 1 reply; 2+ messages in thread
From: Wolfram Sang @ 2011-11-18 11:17 UTC (permalink / raw)
To: u-boot
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;
}
/*
--
1.7.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] apbh_dma: return error value on timeout
2011-11-18 11:17 [U-Boot] [PATCH] apbh_dma: return error value on timeout Wolfram Sang
@ 2011-11-22 7:52 ` Stefano Babic
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Babic @ 2011-11-22 7:52 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-22 7:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-18 11:17 [U-Boot] [PATCH] apbh_dma: return error value on timeout Wolfram Sang
2011-11-22 7:52 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox