From: Fabio Estevam <festevam@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: kernel@pengutronix.de, shawn.guo@freescale.com,
vinod.koul@intel.com, dan.j.williams@intel.com,
Fabio Estevam <festevam@gmail.com>,
Fabio Estevam <fabio.estevam@freescale.com>
Subject: [PATCH] dma: imx-sdma: Add error check on sdma_get_firmware
Date: Mon, 20 Feb 2012 14:49:50 -0200 [thread overview]
Message-ID: <1329756590-19993-1-git-send-email-festevam@gmail.com> (raw)
Add error check on sdma_get_firmware for the pdata case.
While at it, distinguish the error message between the pdata and dt cases.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/dma/imx-sdma.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index bf736ad..52a4e6a 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1388,7 +1388,11 @@ 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 pdata\n");
+ goto err_init;
+ }
} else {
/*
* Because that device tree does not encode ROM script address,
@@ -1404,7 +1408,7 @@ static int __init sdma_probe(struct platform_device *pdev)
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 DT\n");
goto err_init;
}
}
--
1.7.1
next reply other threads:[~2012-02-20 16:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-20 16:49 Fabio Estevam [this message]
2012-02-29 8:38 ` [PATCH] dma: imx-sdma: Add error check on sdma_get_firmware Sascha Hauer
2012-02-29 13:37 ` Fabio Estevam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329756590-19993-1-git-send-email-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=dan.j.williams@intel.com \
--cc=fabio.estevam@freescale.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=shawn.guo@freescale.com \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox