ppc32: Fix booting on some OldWolrd Macs

PATCH New Benjamin Herrenschmidt 1 participant 1 message Aug 18, 2004

lore

Share & tools

lore

Benjamin Herrenschmidt

author

2004-08-18 21:47 UTC #0 lore raw

PATCH 1/1 ppc32: Fix booting on some OldWolrd Macs

Hi !

It seems that on some OldWolrd macs, we don't get the OF stdout device, thus the new set_preferred_console() dies at boot trying to dereference a NULL pointer. Here's a fix:

===== arch/ppc/kernel/setup.c 1.59 vs edited =====

arch/ppc/kernel/setup.c +3 -0

@@ -484,6 +484,9 @@
 	char *name;
 	int offset;
 
+	if (of_stdout_device == NULL)
+		return -ENODEV;
+
 	/* The user has requested a console so this is already set up. */
 	if (strstr(saved_command_line, "console="))
 		return -EBUSY;