Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6d0d7e2d554a2d1a39ee9397c3136df7a53ff348

Authored by Fabio Estevam
Committed by Vinod Koul
1 parent 6602b0ddf3
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: Print a message when firmare fails to be requested 

Print a message when firmare fails to be requested in the case of platform data being used.

While at it, distinguish between the error messages of the device tree and platform data cases.

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 4 additions and 2 deletions Side-by-side Diff

drivers/dma/imx-sdma.c
Diff comments   View file @ 6d0d7e2
... ... @@ -1387,7 +1387,9 @@
1387 1387 sdma_add_scripts(sdma, pdata->script_addrs);
1388 1388  
1389 1389 if (pdata) {
1390   - sdma_get_firmware(sdma, pdata->fw_name);
  1390 + ret = sdma_get_firmware(sdma, pdata->fw_name);
  1391 + if (ret)
  1392 + dev_err(&pdev->dev, "failed to get firmware from platform data\n");
1391 1393 } else {
1392 1394 /*
1393 1395 * Because that device tree does not encode ROM script address,
... ... @@ -1401,7 +1403,7 @@
1401 1403 else {
1402 1404 ret = sdma_get_firmware(sdma, fw_name);
1403 1405 if (ret)
1404   - dev_err(&pdev->dev, "failed to get firmware\n");
  1406 + dev_err(&pdev->dev, "failed to get firmware from device tree\n");
1405 1407 }
1406 1408 }
1407 1409