Skip to content

Commit

Permalink
ipmi: do not probe ACPI devices if si_tryacpi is unset
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Joe Lawrence authored and Corey Minyard committed Mar 18, 2016
1 parent d9dffd2 commit 9f0257b
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9f0257b

Please sign in to comment.