powerpc/powernv: Don't crash if there are no OPAL consoles
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 15 Jul 2013 03:03:14 +0000 (13:03 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 14 Aug 2013 04:58:27 +0000 (14:58 +1000)
Some machines might provide the console via a different mechanism
such as direct access to a UART from Linux, in which case OPAL
might not expose any console. In that case, the code would cause
a NULL dereference.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/powernv/opal.c

index 7c253469f23b9794efbf4d17f94c3dc04be1c080..2911abe550f1d9182ce793f0ec4777b0c85295b7 100644 (file)
@@ -380,18 +380,20 @@ static int __init opal_init(void)
                pr_warn("opal: Node not found\n");
                return -ENODEV;
        }
+
+       /* Register OPAL consoles if any ports */
        if (firmware_has_feature(FW_FEATURE_OPALv2))
                consoles = of_find_node_by_path("/ibm,opal/consoles");
        else
                consoles = of_node_get(opal_node);
-
-       /* Register serial ports */
-       for_each_child_of_node(consoles, np) {
-               if (strcmp(np->name, "serial"))
-                       continue;
-               of_platform_device_create(np, NULL, NULL);
+       if (consoles) {
+               for_each_child_of_node(consoles, np) {
+                       if (strcmp(np->name, "serial"))
+                               continue;
+                       of_platform_device_create(np, NULL, NULL);
+               }
+               of_node_put(consoles);
        }
-       of_node_put(consoles);
 
        /* Find all OPAL interrupts and request them */
        irqs = of_get_property(opal_node, "opal-interrupts", &irqlen);