Skip to contentSkip to conversation

apbh_dma: return error value on timeout

PATCH New Wolfram Sang 2 participants 2 messages Nov 18, 2011 – Nov 22, 2011 dmaengine

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 apbh_dma: return error value on timeout

When a timeout occurs, the return value is prepared but never returned. Fix that.

---
 drivers/dma/apbh_dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/dma/apbh_dma.c +1 -1
index 69a1042..4000974 100644
@@ -606,7 +606,7 @@ int mxs_dma_wait_complete(uint32_t timeout, unsigned int chan)
 		mxs_dma_reset(chan);
 	}
 
-	return 0;
+	return ret;
 }
 
 /*
Signature · 1 line
1.7.7.1
#1 lore raw

PATCH 1/1 apbh_dma: return error value on timeout

Quoted 15 lines · Wolfram Sang

When a timeout occurs, the return value is prepared but never returned. Fix that.

---
 drivers/dma/apbh_dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/dma/apbh_dma.c +0 -0
index 69a1042..4000974 100644

drivers/dma/apbh_dma.c int mxs_dma_wait_complete(uint32_t timeout, unsigned int chan) · line 610

Quoted 6 lines
drivers/dma/apbh_dma.c +1 -1
@@ -606,7 +606,7 @@ int mxs_dma_wait_complete(uint32_t timeout, unsigned int chan)
 		mxs_dma_reset(chan);
 	}
 
-	return 0;
+	return ret;
 }

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================