Commit 339dedf7 authored May 31, 2011 by Benjamin Herrenschmidt Committed by Linus Torvalds May 31, 2011

powerpc/pmac: Don't register pmac PIC syscore ops when HW not present



The Apple custom PIC only exist in some earlier machine models,
anything with an MPIC will crash on suspend if we register those
syscore ops unconditionally.

This is a regression caused by commit f5a592f7 ("PM / PowerPC: Use
struct syscore_ops instead of sysdevs for PM")

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 55922c9d

arch/powerpc/platforms/powermac/pic.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -715,6 +715,7 @@ static struct syscore_ops pmacpic_syscore_ops = {

		static int __init init_pmacpic_syscore(void)
		{
		if (pmac_irq_hw[0])
		register_syscore_ops(&pmacpic_syscore_ops);
		return 0;
		}