From 6cdec87fa4d14065b6150dffbe32cd8c640db769 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@freescale.com>
Date: Thu, 20 Jan 2011 05:50:36 +0800
Subject: [PATCH] --- yaml --- r: 233297 b: refs/heads/master c:
 4b2ce9ddb370c4eb573540611c347d78ac4b54a0 h: refs/heads/master i:   233295:
 c8dce6453cf6717996771767e5c482f4b9ebf7b4 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/dma/imx-sdma.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7dfd12b23594..fdf89083b4c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1797c33f0edcdcc9a483c06233a203786666a97f
+refs/heads/master: 4b2ce9ddb370c4eb573540611c347d78ac4b54a0
diff --git a/trunk/drivers/dma/imx-sdma.c b/trunk/drivers/dma/imx-sdma.c
index cf8cc0b8e7f7..6fc04d85be6b 100644
--- a/trunk/drivers/dma/imx-sdma.c
+++ b/trunk/drivers/dma/imx-sdma.c
@@ -947,6 +947,7 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
 
 	return &sdmac->desc;
 err_out:
+	sdmac->status = DMA_ERROR;
 	return NULL;
 }