drm/i915: Use RSEN instead of HTPLG for tfp410 monitor detection.

[karo-tx-linux.git] / drivers / ssb / sprom.c

diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
index 83bc088b941d25e454ec02a8feaa45e55b570502..4f7cc8d13277ddb84126430923202f9fa7938ac7 100644 (file)
--- a/drivers/ssb/sprom.c
+++ b/drivers/ssb/sprom.c
@@ -14,6 +14,7 @@
 #include "ssb_private.h"
 
 #include <linux/ctype.h>
+#include <linux/slab.h>
 
 
 static const struct ssb_sprom *fallback_sprom;
@@ -184,6 +185,7 @@ bool ssb_is_sprom_available(struct ssb_bus *bus)
        /* this routine differs from specs as we do not access SPROM directly
           on PCMCIA */
        if (bus->bustype == SSB_BUSTYPE_PCI &&
+           bus->chipco.dev &&  /* can be unavailible! */
            bus->chipco.dev->id.revision >= 31)
                return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;