Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 101644
b: refs/heads/master
c: 84f1c1e
h: refs/heads/master
v: v3
  • Loading branch information
Michael Ellerman authored and Paul Mackerras committed Jun 9, 2008
1 parent b47e816 commit 18ecc84
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 997526db9fa408058f23de19c0e12abd9207276b
refs/heads/master: 84f1c1e08906f2206f2bbdd19e4ff6a0757ff7f8
10 changes: 4 additions & 6 deletions trunk/arch/powerpc/sysdev/ipic.c
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,10 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
struct resource res;
u32 temp = 0, ret;

ret = of_address_to_resource(node, 0, &res);
if (ret)
return NULL;

ipic = alloc_bootmem(sizeof(struct ipic));
if (ipic == NULL)
return NULL;
Expand All @@ -739,12 +743,6 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
return NULL;
}

ret = of_address_to_resource(node, 0, &res);
if (ret) {
of_node_put(node);
return NULL;
}

ipic->regs = ioremap(res.start, res.end - res.start + 1);

ipic->irqhost->host_data = ipic;
Expand Down

0 comments on commit 18ecc84

Please sign in to comment.