From 63b8881f519564798e70d5133997c3fca3655076 Mon Sep 17 00:00:00 2001 From: nwhitehorn Date: Tue, 17 Sep 2013 17:31:53 +0000 Subject: Only attach if properties we need (address, in particular) are present. This is the correct version of r255420. Approved by: re (kib) --- sys/powerpc/ofw/ofw_syscons.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c index 84ba302..1c1c4c1 100644 --- a/sys/powerpc/ofw/ofw_syscons.c +++ b/sys/powerpc/ofw/ofw_syscons.c @@ -264,6 +264,10 @@ ofwfb_configure(int flags) } else return (0); + if (OF_getproplen(node, "height") != sizeof(sc->sc_height) || + OF_getproplen(node, "width") != sizeof(sc->sc_width)) + return (0); + sc->sc_depth = depth; sc->sc_node = node; sc->sc_console = 1; @@ -278,6 +282,8 @@ ofwfb_configure(int flags) * * XXX We assume #address-cells is 1 at this point. */ + if (OF_getproplen(node, "address") != sizeof(fb_phys)) + return (0); OF_getprop(node, "address", &fb_phys, sizeof(fb_phys)); bus_space_map(&bs_be_tag, fb_phys, sc->sc_height * sc->sc_stride, -- cgit v1.1