Commit 3cc6e2c5 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus-5.6-2' of git://github.com/cminyard/linux-ipmi

Pull IPMI fix from Corey Minyard:
 "Fix a message spew on some system

  The call to platform_get_irq() was changed to print a log if the
  interrupt was not available, and that was causing bogus messages to
  spew out for the IPMI driver. People have requested that this get in
  to 5.6 so I'm sending it along"

* tag 'for-linus-5.6-2' of git://github.com/cminyard/linux-ipmi:
  ipmi_si: Avoid spurious errors for optional IRQs
parents 2644bc85 443d372d
...@@ -194,7 +194,7 @@ static int platform_ipmi_probe(struct platform_device *pdev) ...@@ -194,7 +194,7 @@ static int platform_ipmi_probe(struct platform_device *pdev)
else else
io.slave_addr = slave_addr; io.slave_addr = slave_addr;
io.irq = platform_get_irq(pdev, 0); io.irq = platform_get_irq_optional(pdev, 0);
if (io.irq > 0) if (io.irq > 0)
io.irq_setup = ipmi_std_irq_setup; io.irq_setup = ipmi_std_irq_setup;
else else
...@@ -378,7 +378,7 @@ static int acpi_ipmi_probe(struct platform_device *pdev) ...@@ -378,7 +378,7 @@ static int acpi_ipmi_probe(struct platform_device *pdev)
io.irq = tmp; io.irq = tmp;
io.irq_setup = acpi_gpe_irq_setup; io.irq_setup = acpi_gpe_irq_setup;
} else { } else {
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq_optional(pdev, 0);
if (irq > 0) { if (irq > 0) {
io.irq = irq; io.irq = irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment