From 8640cd00feaddb431d1bc91d67b47038020fd285 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 29 Feb 2012 11:20:38 -0300 Subject: [PATCH] --- yaml --- r: 297511 b: refs/heads/master c: 6d0d7e2d554a2d1a39ee9397c3136df7a53ff348 h: refs/heads/master i: 297509: 4ab9463f4a5717d1357f04f3559adaa57ff1fcb3 297507: e609d4f3be5e9aee16515971b5a6c7bff1c1f811 297503: f994b1a482ed389732140fbc585a22e9eb978b2f v: v3 --- [refs] | 2 +- trunk/drivers/dma/imx-sdma.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4dd465252d96..f63d9af34dd4 100644 --- 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 index 05fa3a1d95a1..c4958823518a 100644 --- 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"); } }