Commit 7c9d9360 authored by Alastair Bridgewater's avatar Alastair Bridgewater Committed by Benjamin Herrenschmidt

powerpc: Fix mpic_resume on early G5 macs

mpic_resume() on G5 macs blindly dereferences mpic->fixups, but
it may legitimately be NULL (as on PowerMac7,2).  Add an explicit
check.

This fixes suspend-to-disk with one processor (maxcpus=1) for me.
Signed-off-by: default avatarAlastair Bridgewater <alastair.bridgewater@gmail.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent bd2b64a1
...@@ -1666,7 +1666,7 @@ static int mpic_resume(struct sys_device *dev) ...@@ -1666,7 +1666,7 @@ static int mpic_resume(struct sys_device *dev)
mpic->save_data[i].dest); mpic->save_data[i].dest);
#ifdef CONFIG_MPIC_U3_HT_IRQS #ifdef CONFIG_MPIC_U3_HT_IRQS
{ if (mpic->fixups) {
struct mpic_irq_fixup *fixup = &mpic->fixups[i]; struct mpic_irq_fixup *fixup = &mpic->fixups[i];
if (fixup->base) { if (fixup->base) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment