Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61e37ca2 authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[POWERPC] Avoid NULL pointer in gpio1_interrupt 



gpio1_interrupt() may dereference a NULL pointer if ioremap() fails.
But, maybe no gpio interrupt happens in the first place?

Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a8ed4f7e

drivers/macintosh/via-pmu.c

+6 −1
Original line number Diff line number Diff line
@@ -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;
@@ -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;

}