summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorJoe Lawrence <joe.lawrence@stratus.com>2016-02-18 16:02:54 -0500
committerCorey Minyard <cminyard@mvista.com>2016-03-18 07:01:24 -0500
commit9f0257b39c138330fec96e0f8f1a0135c1f0b6a5 (patch)
tree04c059ae0b9e71b1f0118d438ed280d8dfacb2d8 /drivers/char
parentd9dffd2a0bd84039f1b4f7e8835f1b0bbde0b3a7 (diff)
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 8671236013f8..1e25b5205724 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;