MIPS: Let __dt_register_buses accept a single bus type
authorKevin Cernekee <cernekee@gmail.com>
Thu, 25 Dec 2014 17:49:07 +0000 (09:49 -0800)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 1 Apr 2015 15:21:38 +0000 (17:21 +0200)
Some machines only have one bus type to register (e.g. "simple-bus").

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: f.fainelli@gmail.com
Cc: jaedon.shin@gmail.com
Cc: abrestic@chromium.org
Cc: tglx@linutronix.de
Cc: jason@lakedaemon.net
Cc: jogo@openwrt.org
Cc: arnd@arndb.de
Cc: computersforpeace@gmail.com
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8845/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/prom.c

index 452d435..e303cb1 100644 (file)
@@ -64,7 +64,10 @@ int __init __dt_register_buses(const char *bus0, const char *bus1)
                panic("device tree not present");
 
        strlcpy(of_ids[0].compatible, bus0, sizeof(of_ids[0].compatible));
-       strlcpy(of_ids[1].compatible, bus1, sizeof(of_ids[1].compatible));
+       if (bus1) {
+               strlcpy(of_ids[1].compatible, bus1,
+                       sizeof(of_ids[1].compatible));
+       }
 
        if (of_platform_populate(NULL, of_ids, NULL, NULL))
                panic("failed to populate DT");