Author: jhibbits
Date: Sun May 20 02:43:54 2012
New Revision: 235678
URL: http://svn.freebsd.org/changeset/base/235678

Log:
  "nvram,flash" may not be the first in the compatible list property of the
  nvram ofw node, so check all strings in the list.
  
  Approved by:  nwhitehorn (mentor)
  MFC after:    3 days

Modified:
  head/sys/dev/powermac_nvram/powermac_nvram.c

Modified: head/sys/dev/powermac_nvram/powermac_nvram.c
==============================================================================
--- head/sys/dev/powermac_nvram/powermac_nvram.c        Sun May 20 02:05:25 
2012        (r235677)
+++ head/sys/dev/powermac_nvram/powermac_nvram.c        Sun May 20 02:43:54 
2012        (r235678)
@@ -36,6 +36,7 @@
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
 
 #include <machine/bus.h>
 #include <machine/md_var.h>
@@ -118,7 +119,7 @@ powermac_nvram_probe(device_t dev)
        if (strcmp(type, "nvram") != 0)
                return ENXIO;
        if (strcmp(compatible, "amd-0137") != 0 &&
-           strcmp(compatible, "nvram,flash") != 0)
+           !ofw_bus_is_compatible(dev, "nvram,flash"))
                return ENXIO;
 
        device_set_desc(dev, "Apple NVRAM");
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to