From 7d59f1b40d08b0d5e00ef6711923d8fe7ee366e8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 8 Mar 2012 09:26:39 -0300 Subject: [PATCH] --- yaml --- r: 297528 b: refs/heads/master c: ad1122e545b55013089e6cc18ac37b47b46f2a7d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/imx-sdma.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f89cfc162167..32988cad8f0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f3d6dc0be92f0caca937926cca16ec4fdd585a3 +refs/heads/master: ad1122e545b55013089e6cc18ac37b47b46f2a7d diff --git a/trunk/drivers/dma/imx-sdma.c b/trunk/drivers/dma/imx-sdma.c index 5da552d1f92d..f8259ee49f86 100644 --- a/trunk/drivers/dma/imx-sdma.c +++ b/trunk/drivers/dma/imx-sdma.c @@ -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, @@ -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"); } }