Skip to content

Commit 3cc6e2c

Browse files
committed
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
2 parents 2644bc8 + 443d372 commit 3cc6e2c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/char/ipmi/ipmi_si_platform.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static int platform_ipmi_probe(struct platform_device *pdev)
194194
else
195195
io.slave_addr = slave_addr;
196196

197-
io.irq = platform_get_irq(pdev, 0);
197+
io.irq = platform_get_irq_optional(pdev, 0);
198198
if (io.irq > 0)
199199
io.irq_setup = ipmi_std_irq_setup;
200200
else
@@ -378,7 +378,7 @@ static int acpi_ipmi_probe(struct platform_device *pdev)
378378
io.irq = tmp;
379379
io.irq_setup = acpi_gpe_irq_setup;
380380
} else {
381-
int irq = platform_get_irq(pdev, 0);
381+
int irq = platform_get_irq_optional(pdev, 0);
382382

383383
if (irq > 0) {
384384
io.irq = irq;

0 commit comments

Comments
 (0)