From: Zhao Yakui <yakui.zhao@xxxxxxxxx> Sometimes one IPMI system interface will be detected by several methods. For example: ACPI mechanism, SPMI table, DMI or hardcode mechanism. In such case when one IPMI system interface can be detected in two mechanism, the second mechanism will fail in the detection and can't record which IPMI system interface is detected by it. Use the ACPI detection mechanism firstly to detect the IPMI system interface so that we can know which IPMI system interface is detected in ACPI namespace. Signed-off-by: Zhao Yakui <yakui.zhao@xxxxxxxxx> cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx> --- drivers/char/ipmi/ipmi_si_intf.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 679cd08..99fecd2 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -3195,6 +3195,10 @@ static __devinit int init_ipmi_si(void) printk(KERN_INFO "IPMI System Interface driver.\n"); +#ifdef CONFIG_PNP + pnp_register_driver(&ipmi_pnp_driver); +#endif + hardcode_find_bmc(); #ifdef CONFIG_DMI @@ -3204,9 +3208,6 @@ static __devinit int init_ipmi_si(void) #ifdef CONFIG_ACPI spmi_find_bmc(); #endif -#ifdef CONFIG_PNP - pnp_register_driver(&ipmi_pnp_driver); -#endif #ifdef CONFIG_PCI rv = pci_register_driver(&ipmi_pci_driver); -- 1.5.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
