mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Fabio Estevam 2012-02-29 11:20:38 -03:00 committed by Vinod Koul
parent 6602b0ddf3
commit 6d0d7e2d55
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma/imx-sdma.c
View File

@ -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");
}
}