From: Joe Lawrence <joe.lawrence@stratus.com>
Date: Thu, 18 Feb 2016 21:02:54 +0000 (-0500)
Subject: ipmi: do not probe ACPI devices if si_tryacpi is unset
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9f0257b39c138330fec96e0f8f1a0135c1f0b6a5;p=linux.git

ipmi: do not probe ACPI devices if si_tryacpi is unset

Extend the tryacpi module parameter to turn off acpi_ipmi_probe such
that hard-coded options (type, ports, address, etc.) have complete
control over the smi_info data structures setup by the driver.

Signed-off-by: Joe Lawrence <joe.lawrence@stratus.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
---

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 8671236013f80..1e25b5205724d 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2690,6 +2690,9 @@ static int acpi_ipmi_probe(struct platform_device *dev)
 	unsigned long long tmp;
 	int rv = -EINVAL;
 
+	if (!si_tryacpi)
+	       return 0;
+
 	handle = ACPI_HANDLE(&dev->dev);
 	if (!handle)
 		return -ENODEV;