projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmk_cookie_fixes2' into next
[linux-2.6-block.git]
/
drivers
/
dma
/
imx-sdma.c
diff --git
a/drivers/dma/imx-sdma.c
b/drivers/dma/imx-sdma.c
index 81f9d57ec70f614ff0928643e5d1d548f46a97ec..5da552d1f92d9410574f0330b96b5aec2d9b2d6d 100644
(file)
--- a/
drivers/dma/imx-sdma.c
+++ b/
drivers/dma/imx-sdma.c
@@
-1377,7
+1377,9
@@
static int __init sdma_probe(struct platform_device *pdev)
sdma_add_scripts(sdma, pdata->script_addrs);
if (pdata) {
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,
} else {
/*
* Because that device tree does not encode ROM script address,
@@
-1386,15
+1388,12
@@
static int __init sdma_probe(struct platform_device *pdev)
*/
ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
&fw_name);
*/
ret = of_property_read_string(np, "fsl,sdma-ram-script-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;
- }
-
- ret = sdma_get_firmware(sdma, fw_name);
- if (ret) {
- dev_err(&pdev->dev, "failed to get firmware\n");
- goto err_init;
+ else {
+ ret = sdma_get_firmware(sdma, fw_name);
+ if (ret)
+ dev_err(&pdev->dev, "failed to get firmware from device tree\n");
}
}
}
}