Author: sbruno
Date: Tue Jul 30 18:54:24 2013
New Revision: 253813
URL: http://svnweb.freebsd.org/changeset/base/253813
Log:
Check for ipmi_attached in ipmi_isa_probe as a suggested alternative to
ipmi_isa_attach. This keeps unintended but harmless noise about "ipmi1"
from appearing in the boot up sequence.
Submitted by: jbh@ (suggested by)
Sponsored by: Yahoo! Inc.
Modified:
head/sys/dev/ipmi/ipmi_isa.c
Modified: head/sys/dev/ipmi/ipmi_isa.c
==============================================================================
--- head/sys/dev/ipmi/ipmi_isa.c Tue Jul 30 18:44:29 2013
(r253812)
+++ head/sys/dev/ipmi/ipmi_isa.c Tue Jul 30 18:54:24 2013
(r253813)
@@ -78,6 +78,14 @@ static int
ipmi_isa_probe(device_t dev)
{
+ /*
+ * Give other drivers precedence. Unfortunately, this doesn't
+ * work if we have an SMBIOS table that duplicates a PCI device
+ * that's later on the bus than the PCI-ISA bridge.
+ */
+ if (ipmi_attached)
+ return (ENXIO);
+
/* Skip any PNP devices. */
if (isa_get_logicalid(dev) != 0)
return (ENXIO);
@@ -175,14 +183,6 @@ ipmi_isa_attach(device_t dev)
!ipmi_hint_identify(dev, &info))
return (ENXIO);
- /*
- * Give other drivers precedence. Unfortunately, this doesn't
- * work if we have an SMBIOS table that duplicates a PCI device
- * that's later on the bus than the PCI-ISA bridge.
- */
- if (ipmi_attached)
- return (EBUSY);
-
switch (info.iface_type) {
case KCS_MODE:
count = 2;
_______________________________________________
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"
