Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 297528
b: refs/heads/master
c: ad1122e
h: refs/heads/master
v: v3
  • Loading branch information
Fabio Estevam authored and Vinod Koul committed Mar 21, 2012
1 parent 70283e8 commit 7d59f1b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1f3d6dc0be92f0caca937926cca16ec4fdd585a3
refs/heads/master: ad1122e545b55013089e6cc18ac37b47b46f2a7d
6 changes: 3 additions & 3 deletions trunk/drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@ static int __init sdma_probe(struct platform_device *pdev)
if (pdata) {
ret = sdma_get_firmware(sdma, pdata->fw_name);
if (ret)
dev_err(&pdev->dev, "failed to get firmware from platform data\n");
dev_warn(&pdev->dev, "failed to get firmware from platform data\n");
} else {
/*
* Because that device tree does not encode ROM script address,
Expand All @@ -1389,11 +1389,11 @@ static int __init sdma_probe(struct platform_device *pdev)
ret = of_property_read_string(np, "fsl,sdma-ram-script-name",
&fw_name);
if (ret)
dev_err(&pdev->dev, "failed to get firmware name\n");
dev_warn(&pdev->dev, "failed to get firmware name\n");
else {
ret = sdma_get_firmware(sdma, fw_name);
if (ret)
dev_err(&pdev->dev, "failed to get firmware from device tree\n");
dev_warn(&pdev->dev, "failed to get firmware from device tree\n");
}
}

Expand Down

0 comments on commit 7d59f1b

Please sign in to comment.