From 49680563b950b1d69c72646a2e1bf345f166e567 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <festevam@gmail.com>
Date: Wed, 29 Feb 2012 11:20:37 -0300
Subject: [PATCH] --- yaml --- r: 297510 b: refs/heads/master c:
 6602b0ddf399d4438fdea17b4b4a65df5ec97bb8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1c0f24dadbed..4dd465252d96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e15db7ce949e9f2d8bb6ce32a74212a4f662370
+refs/heads/master: 6602b0ddf399d4438fdea17b4b4a65df5ec97bb8
diff --git a/trunk/drivers/dma/imx-sdma.c b/trunk/drivers/dma/imx-sdma.c
index 8220f5703c79..05fa3a1d95a1 100644
--- a/trunk/drivers/dma/imx-sdma.c
+++ b/trunk/drivers/dma/imx-sdma.c
@@ -1396,15 +1396,12 @@ static int __init sdma_probe(struct platform_device *pdev)
 		 */
 		ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
 					      &fw_name);
-		if (ret) {
+		if (ret)
 			dev_err(&pdev->dev, "failed to get firmware name\n");
-			goto err_init;
-		}
-
-		ret = sdma_get_firmware(sdma, fw_name);
-		if (ret) {
-			dev_err(&pdev->dev, "failed to get firmware\n");
-			goto err_init;
+		else {
+			ret = sdma_get_firmware(sdma, fw_name);
+			if (ret)
+				dev_err(&pdev->dev, "failed to get firmware\n");
 		}
 	}