Attachment 267541 Details for Bug 396751 – Patch from the reporter.

[patch] Patch from the reporter.

ppc-chrs-null-fix.diff (text/plain), 1.32 KB, created by Jan Lieskovsky on 2007-11-23 13:49:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Lieskovsky

Created: 2007-11-23 13:49:34 UTC

Size: 1.32 KB

patch

obsolete

> arch/powerpc/platforms/chrp/setup.c |   13 +++++++++----
> 1 files changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
>index 5930626..da4e45e 100644
>--- a/arch/powerpc/platforms/chrp/setup.c
>+++ b/arch/powerpc/platforms/chrp/setup.c
>@@ -115,7 +115,7 @@ void chrp_show_cpuinfo(struct seq_file *m)
> 	seq_printf(m, "machine\t\t: CHRP %s\n", model);
> 
> 	/* longtrail (goldengate) stuff */
>-	if (!strncmp(model, "IBM,LongTrail", 13)) {
>+	if (model && !strncmp(model, "IBM,LongTrail", 13)) {
> 		/* VLSI VAS96011/12 `Golden Gate 2' */
> 		/* Memory banks */
> 		sdramen = (in_le32(gg2_pci_config_base + GG2_PCI_DRAM_CTRL)
>@@ -203,15 +203,20 @@ static void __init sio_fixup_irq(const char *name, u8 device, u8 level,
> static void __init sio_init(void)
> {
> 	struct device_node *root;
>+	const char *model;
> 
>-	if ((root = of_find_node_by_path("/")) &&
>-	    !strncmp(of_get_property(root, "model", NULL),
>-			"IBM,LongTrail", 13)) {
>+	root = of_find_node_by_path("/");
>+	if (!root)
>+		return;
>+
>+	model = of_get_property(root, "model", NULL);
>+	if (model && !strncmp(model,"IBM,LongTrail", 13)) {
> 		/* logical device 0 (KBC/Keyboard) */
> 		sio_fixup_irq("keyboard", 0, 1, 2);
> 		/* select logical device 1 (KBC/Mouse) */
> 		sio_fixup_irq("mouse", 1, 12, 2);
> 	}
>+
> 	of_node_put(root);
> }
>

Actions: View | Diff

Attachments on bug 396751: 267541