aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2012-02-29 09:20:38 -0500
committerVinod Koul <vinod.koul@linux.intel.com>2012-03-06 07:04:05 -0500
commit6d0d7e2d554a2d1a39ee9397c3136df7a53ff348 (patch)
treef2dfa4de5aca3744903ef6c33eaefe81deaecb36 /drivers/dma
parent6602b0ddf399d4438fdea17b4b4a65df5ec97bb8 (diff)
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>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/imx-sdma.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 05fa3a1d95a1..c4958823518a 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1387,7 +1387,9 @@ static int __init sdma_probe(struct platform_device *pdev)
1387 sdma_add_scripts(sdma, pdata->script_addrs); 1387 sdma_add_scripts(sdma, pdata->script_addrs);
1388 1388
1389 if (pdata) { 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 } else { 1393 } else {
1392 /* 1394 /*
1393 * Because that device tree does not encode ROM script address, 1395 * Because that device tree does not encode ROM script address,
@@ -1401,7 +1403,7 @@ static int __init sdma_probe(struct platform_device *pdev)
1401 else { 1403 else {
1402 ret = sdma_get_firmware(sdma, fw_name); 1404 ret = sdma_get_firmware(sdma, fw_name);
1403 if (ret) 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