Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 212849
b: refs/heads/master
c: 182f30e
h: refs/heads/master
i:
  212847: 520b63b
v: v3
  • Loading branch information
Julia Lawall authored and Benjamin Herrenschmidt committed Sep 2, 2010
1 parent 13f8053 commit 32c5aae
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 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: 0373721b19217c85c8c9435b79f0bac88fec9f26
refs/heads/master: 182f30e4b9f6e26d565eb432d1140a487c64fa17
4 changes: 3 additions & 1 deletion trunk/arch/powerpc/platforms/cell/ras.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,10 @@ static int __init cbe_ptcal_enable(void)
return -ENODEV;

size = of_get_property(np, "ibm,cbe-ptcal-size", NULL);
if (!size)
if (!size) {
of_node_put(np);
return -ENODEV;
}

pr_debug("%s: enabling PTCAL, size = 0x%x\n", __func__, *size);
order = get_order(*size);
Expand Down
4 changes: 3 additions & 1 deletion trunk/arch/powerpc/platforms/cell/spider-pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,10 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
return NO_IRQ;
imap += intsize + 1;
tmp = of_get_property(iic, "#interrupt-cells", NULL);
if (tmp == NULL)
if (tmp == NULL) {
of_node_put(iic);
return NO_IRQ;
}
intsize = *tmp;
/* Assume unit is last entry of interrupt specifier */
unit = imap[intsize - 1];
Expand Down

0 comments on commit 32c5aae

Please sign in to comment.