From 9950c77796972141961cd521cf842d2981a266a5 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 11 Jun 2012 20:11:40 +0200
Subject: [PATCH] --- yaml --- r: 316633 b: refs/heads/master c:
 3052cc2c92f11875d111d5b7b9b3ad535b3128b9 h: refs/heads/master i:   316631:
 d8d383d66ef966a3fe4fc05baf4cb0cedee07275 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/dmaengine.h | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 24fa894fed6d..028cd6f670db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a0760358cbe922ba7440389ddae649bc56221ef
+refs/heads/master: 3052cc2c92f11875d111d5b7b9b3ad535b3128b9
diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h
index ccec62f8e501..9c02a4508b25 100644
--- a/trunk/include/linux/dmaengine.h
+++ b/trunk/include/linux/dmaengine.h
@@ -674,6 +674,12 @@ static inline int dmaengine_resume(struct dma_chan *chan)
 	return dmaengine_device_control(chan, DMA_RESUME, 0);
 }
 
+static inline enum dma_status dmaengine_tx_status(struct dma_chan *chan,
+	dma_cookie_t cookie, struct dma_tx_state *state)
+{
+	return chan->device->device_tx_status(chan, cookie, state);
+}
+
 static inline dma_cookie_t dmaengine_submit(struct dma_async_tx_descriptor *desc)
 {
 	return desc->tx_submit(desc);