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.
This commit is contained in:
Sean Bruno 2013-07-30 18:54:24 +00:00
parent de3e1e6590
commit ef3103bba8
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=253813

View File

@ -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;