aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/imx-sdma.c
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2012-02-29 09:20:37 -0500
committerVinod Koul <vinod.koul@linux.intel.com>2012-03-06 07:04:05 -0500
commit6602b0ddf399d4438fdea17b4b4a65df5ec97bb8 (patch)
treeacd8d62825ffe090a854cc6ba6443c55f2ce3fe7 /drivers/dma/imx-sdma.c
parent9e15db7ce949e9f2d8bb6ce32a74212a4f662370 (diff)
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>
Diffstat (limited to 'drivers/dma/imx-sdma.c')
-rw-r--r--drivers/dma/imx-sdma.c13
1 files changed, 5 insertions, 8 deletions
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)
1396 */ 1396 */
1397 ret = of_property_read_string(np, "fsl,sdma-ram-script-name", 1397 ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
1398 &fw_name); 1398 &fw_name);
1399 if (ret) { 1399 if (ret)
1400 dev_err(&pdev->dev, "failed to get firmware name\n"); 1400 dev_err(&pdev->dev, "failed to get firmware name\n");
1401 goto err_init; 1401 else {
1402 } 1402 ret = sdma_get_firmware(sdma, fw_name);
1403 1403 if (ret)
1404 ret = sdma_get_firmware(sdma, fw_name); 1404 dev_err(&pdev->dev, "failed to get firmware\n");
1405 if (ret) {
1406 dev_err(&pdev->dev, "failed to get firmware\n");
1407 goto err_init;
1408 } 1405 }
1409 } 1406 }
1410 1407