[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100423171244.GB2140@oksana.dev.rtsoft.ru>
Date: Fri, 23 Apr 2010 21:12:44 +0400
From: Anton Vorontsov <avorontsov@...sta.com>
To: David Miller <davem@...emloft.net>
Cc: Sandeep Gopalpet <Sandeep.Kumar@...escale.com>,
netdev@...r.kernel.org, linuxppc-dev@...abs.org
Subject: [PATCH 2/2] gianfar: Fix potential oops during OF address
translation
gianfar driver may pass NULL pointer to the of_translate_address(),
which may lead to a kernel oops. Fix this by using of_iomap(), which
is also much simpler and shorter.
Signed-off-by: Anton Vorontsov <avorontsov@...sta.com>
---
drivers/net/gianfar.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 080d1ce..df49af3 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -549,12 +549,8 @@ static int gfar_parse_group(struct device_node *np,
struct gfar_private *priv, const char *model)
{
u32 *queue_mask;
- u64 addr, size;
-
- addr = of_translate_address(np,
- of_get_address(np, 0, &size, NULL));
- priv->gfargrp[priv->num_grps].regs = ioremap(addr, size);
+ priv->gfargrp[priv->num_grps].regs = of_iomap(np, 0);
if (!priv->gfargrp[priv->num_grps].regs)
return -ENOMEM;
--
1.7.0.5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists