summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2012-02-29 15:20:38 +0100
committerVinod Koul <vinod.koul@linux.intel.com>2012-03-06 13:04:05 +0100
commit6d0d7e2d554a2d1a39ee9397c3136df7a53ff348 (patch)
treef2dfa4de5aca3744903ef6c33eaefe81deaecb36 /drivers/dma
parentdma: imx-sdma: Let the driver be probed even if no firware is found (diff)
downloadlinux-6d0d7e2d554a2d1a39ee9397c3136df7a53ff348.tar.xz
linux-6d0d7e2d554a2d1a39ee9397c3136df7a53ff348.zip
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)
sdma_add_scripts(sdma, pdata->script_addrs);
if (pdata) {
- sdma_get_firmware(sdma, pdata->fw_name);
+ ret = sdma_get_firmware(sdma, pdata->fw_name);
+ if (ret)
+ dev_err(&pdev->dev, "failed to get firmware from platform data\n");
} else {
/*
* Because that device tree does not encode ROM script address,
@@ -1401,7 +1403,7 @@ static int __init sdma_probe(struct platform_device *pdev)
else {
ret = sdma_get_firmware(sdma, fw_name);
if (ret)
- dev_err(&pdev->dev, "failed to get firmware\n");
+ dev_err(&pdev->dev, "failed to get firmware from device tree\n");
}
}