From: Fabio Estevam <festevam@gmail.com>
Date: Wed, 29 Feb 2012 14:20:37 +0000 (-0300)
Subject: dma: imx-sdma: Let the driver be probed even if no firware is found
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6602b0ddf399d4438fdea17b4b4a65df5ec97bb8;p=linux-beck.git

dma: imx-sdma: Let the driver be probed even if no firware is found

On the device tree case the code bails out when the firmware name cannot be found
or if the firmware fails to be requested.

Fix this behaviour as the SDMA engine can still operate with the built-in
ROM scripts.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
---

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 8220f5703c79..05fa3a1d95a1 100644
--- a/drivers/dma/imx-sdma.c
+++ b/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");
 		}
 	}