dma: imx-sdma: Let the driver be probed even if no firware is found
authorFabio Estevam <festevam@gmail.com>
Wed, 29 Feb 2012 14:20:37 +0000 (11:20 -0300)
committerVinod Koul <vinod.koul@linux.intel.com>
Tue, 6 Mar 2012 12:04:05 +0000 (17:34 +0530)
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>
drivers/dma/imx-sdma.c

index 8220f5703c79434c0b1f47ad755b2a819f39ca5f..05fa3a1d95a1e263efcee68398597fb305e18d70 100644 (file)
@@ -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");
                }
        }