From: padma.v@samsung.com (Padmavathi Venna)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] dma: of-dma: return error when 'dma-cells' not found
Date: Tue, 05 Mar 2013 14:55:30 +0530 [thread overview]
Message-ID: <1362475531-32260-1-git-send-email-padma.v@samsung.com> (raw)
This patch returns error when 'dma-cells' property not found
in the corresponding device node. With out this change there
is a crash in the generic dma incompatible platforms.
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
---
Based on Vinod Koul next branch.
drivers/dma/of-dma.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index 69d04d2..46aca0d 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -92,6 +92,7 @@ int of_dma_controller_register(struct device_node *np,
void *data)
{
struct of_dma *ofdma;
+ const __be32 *ip;
int nbcells;
if (!np || !of_dma_xlate) {
@@ -103,7 +104,12 @@ int of_dma_controller_register(struct device_node *np,
if (!ofdma)
return -ENOMEM;
- nbcells = be32_to_cpup(of_get_property(np, "#dma-cells", NULL));
+ ip = of_get_property(np, "#dma-cells", NULL);
+ if (!ip)
+ return -ENXIO;
+
+ nbcells = be32_to_cpup(ip);
+
if (!nbcells) {
pr_err("%s: #dma-cells property is missing or invalid\n",
__func__);
--
1.7.4.4
next reply other threads:[~2013-03-05 9:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-05 9:25 Padmavathi Venna [this message]
2013-03-05 9:25 ` [PATCH V2] DMA: PL330: Add check if device tree compatible Padmavathi Venna
2013-03-13 5:36 ` Padma Venkat
2013-03-21 9:39 ` Vinod Koul
2013-04-01 13:13 ` Rob Herring
2013-04-01 18:21 ` Vinod Koul
2013-04-02 2:58 ` Padma Venkat
2013-03-05 9:43 ` [PATCH] dma: of-dma: return error when 'dma-cells' not found Rob Herring
2013-03-05 10:04 ` Padma Venkat
2013-03-05 10:15 ` Arnd Bergmann
2013-03-05 14:56 ` Rob Herring
2013-03-05 19:48 ` Arnd Bergmann
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=1362475531-32260-1-git-send-email-padma.v@samsung.com \
--to=padma.v@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).