Skip to content

Commit

Permalink
[POWERPC] Avoid NULL pointer in gpio1_interrupt
Browse files Browse the repository at this point in the history
gpio1_interrupt() may dereference a NULL pointer if ioremap() fails.
But, maybe no gpio interrupt happens in the first place?

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Olaf Hering authored and Paul Mackerras committed Oct 2, 2006
1 parent a8ed4f7 commit 61e37ca
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/macintosh/via-pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,10 @@ int __init find_via_pmu(void)
if (gaddr != OF_BAD_ADDR)
gpio_reg = ioremap(gaddr, 0x10);
}
if (gpio_reg == NULL)
if (gpio_reg == NULL) {
printk(KERN_ERR "via-pmu: Can't find GPIO reg !\n");
goto fail_gpio;
}
} else
pmu_kind = PMU_UNKNOWN;

Expand Down Expand Up @@ -365,6 +367,9 @@ int __init find_via_pmu(void)
return 1;
fail:
of_node_put(vias);
iounmap(gpio_reg);
gpio_reg = NULL;
fail_gpio:
vias = NULL;
return 0;
}
Expand Down

0 comments on commit 61e37ca

Please sign in to comment.