From 355597a27486640c794eb12841ec9a832fe4ec4a Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 26 May 2008 12:12:31 +1000 Subject: [PATCH] --- yaml --- r: 101645 b: refs/heads/master c: 2272a55f16c998d916904bba018b0f40f430d744 h: refs/heads/master i: 101643: b47e816b540730d605d330346c69c5f99b3bad4a v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9690adb8b7fe..e73c9cfbe616 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84f1c1e08906f2206f2bbdd19e4ff6a0757ff7f8 +refs/heads/master: 2272a55f16c998d916904bba018b0f40f430d744 diff --git a/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c b/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c index f59444d3be75..c11b313f015b 100644 --- a/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c +++ b/trunk/arch/powerpc/sysdev/qe_lib/qe_ic.c @@ -329,6 +329,10 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags, struct resource res; u32 temp = 0, ret, high_active = 0; + ret = of_address_to_resource(node, 0, &res); + if (ret) + return; + qe_ic = alloc_bootmem(sizeof(struct qe_ic)); if (qe_ic == NULL) return; @@ -342,10 +346,6 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags, return; } - ret = of_address_to_resource(node, 0, &res); - if (ret) - return; - qe_ic->regs = ioremap(res.start, res.end - res.start + 1); qe_ic->irqhost->host_data = qe_ic;