Skip to content

Commit

Permalink
dma: imx-sdma: Let the driver be probed even if no firware is found
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fabio Estevam authored and Vinod Koul committed Mar 6, 2012
1 parent 9e15db7 commit 6602b0d
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}

Expand Down

0 comments on commit 6602b0d

Please sign in to comment.