---

yaml --- r: 297511 b: refs/heads/master c: 6d0d7e2 h: refs/heads/master i: 297509: 4ab9463 297507: e609d4f 297503: f994b1a v: v3
git-mirror · Mar 6, 2012 · 8640cd0 · 8640cd0
1 parent 4968056
commit 8640cd0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6602b0ddf399d4438fdea17b4b4a65df5ec97bb8
+refs/heads/master: 6d0d7e2d554a2d1a39ee9397c3136df7a53ff348
diff --git a/trunk/drivers/dma/imx-sdma.c b/trunk/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");
 		}
 	}