From b9723869ce493af2041b76e2f5fabb09e4e73900 Mon Sep 17 00:00:00 2001
From: "Steven J. Magnani" <steve@digidescorp.com>
Date: Thu, 25 Feb 2010 13:39:30 -0600
Subject: [PATCH] --- yaml --- r: 185755 b: refs/heads/master c:
 6ca3a7a96e91b1aa8c704153c992b191d35b5747 h: refs/heads/master i:   185753:
 fbcd9ee5b9f3f976a81bcffd9ec4fc4d2f74e551   185751:
 fafc1bc2d5126da04b5d7ba7d707dca916eb52d4 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/dma/fsldma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ead6d7c8b2bc..1d699801f54d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ad7bd2944bd979ef4877cd439719be44c5f3b47
+refs/heads/master: 6ca3a7a96e91b1aa8c704153c992b191d35b5747
diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c
index 92efa87258b9..6541ebf8bf63 100644
--- a/trunk/drivers/dma/fsldma.c
+++ b/trunk/drivers/dma/fsldma.c
@@ -362,7 +362,7 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
 		if (cookie < 0)
 			cookie = 1;
 
-		desc->async_tx.cookie = cookie;
+		child->async_tx.cookie = cookie;
 	}
 
 	chan->common.cookie = cookie;