Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

dma: imx-sdma: Let the driver be probed even if no firware is found

Browse Source 
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>
This commit is contained in:
Fabio Estevam 2012-02-29 11:20:37 -03:00 committed by Vinod Koul
parent 9e15db7ce9
commit 6602b0ddf3
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1396,15 +1396,12 @@ static int __init sdma_probe(struct platform_device *pdev)
*/ */
ret = of_property_read_string(np, "fsl,sdma-ram-script-name", ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
&fw_name); &fw_name);
if (ret) { if (ret)
dev_err(&pdev->dev, "failed to get firmware name\n"); dev_err(&pdev->dev, "failed to get firmware name\n");
goto err_init; else {
} ret = sdma_get_firmware(sdma, fw_name);
if (ret)
ret = sdma_get_firmware(sdma, fw_name); dev_err(&pdev->dev, "failed to get firmware\n");
if (ret) {
dev_err(&pdev->dev, "failed to get firmware\n");
goto err_init;
} }
} }