Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6602b0ddf399d4438fdea17b4b4a65df5ec97bb8

Authored by Fabio Estevam
Committed by Vinod Koul
1 parent 9e15db7ce9
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 5 additions and 8 deletions Side-by-side Diff

drivers/dma/imx-sdma.c
Diff comments   View file @ 6602b0d
... ... @@ -1396,15 +1396,12 @@
1396 1396 */
1397 1397 ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
1398 1398 &fw_name);
1399   - if (ret) {
  1399 + if (ret)
1400 1400 dev_err(&pdev->dev, "failed to get firmware name\n");
1401   - goto err_init;
1402   - }
1403   -
1404   - ret = sdma_get_firmware(sdma, fw_name);
1405   - if (ret) {
1406   - dev_err(&pdev->dev, "failed to get firmware\n");
1407   - goto err_init;
  1401 + else {
  1402 + ret = sdma_get_firmware(sdma, fw_name);
  1403 + if (ret)
  1404 + dev_err(&pdev->dev, "failed to get firmware\n");
1408 1405 }
1409 1406 }
1410 1407