From 9041ab791a197ad382d1c85e239824ebe77e6f2d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 12 Jul 2011 21:00:13 +0800
Subject: [PATCH] --- yaml --- r: 262045 b: refs/heads/master c:
 1c1d9547536480626c1be1fb062b81663fb2b88e h: refs/heads/master i:   262043:
 832e247dc4cc9893da28657ce7a78edab0318ab8 v: v3

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

diff --git a/[refs] b/[refs]
index d2d861e1ca67..f2f4ac9bfda2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b052f4a088ddc47a5da23dd733522241314cfb4
+refs/heads/master: 1c1d9547536480626c1be1fb062b81663fb2b88e
diff --git a/trunk/drivers/dma/imx-sdma.c b/trunk/drivers/dma/imx-sdma.c
index b6d1455fa936..ec53980f8fcf 100644
--- a/trunk/drivers/dma/imx-sdma.c
+++ b/trunk/drivers/dma/imx-sdma.c
@@ -1281,8 +1281,10 @@ static int __init sdma_probe(struct platform_device *pdev)
 		goto err_request_irq;
 
 	sdma->script_addrs = kzalloc(sizeof(*sdma->script_addrs), GFP_KERNEL);
-	if (!sdma->script_addrs)
+	if (!sdma->script_addrs) {
+		ret = -ENOMEM;
 		goto err_alloc;
+	}
 
 	sdma->version = pdata->sdma_version;