Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ac8aa8d authored by Corey Minyard's avatar Corey Minyard
Browse files

ipmi_si: Fix oops with PCI devices 

When the IPMI PCI code was split out, some code was consolidated for
setting the io_setup field in the io structure.  The PCI code needed
this set before registration to probe register spacing, though, so
restore the old code for that function.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197999


Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Tested-by: default avatarMeelis Roos <mroos@linux.ee>
parent 4f7f5551

drivers/char/ipmi/ipmi_si_pci.c

+5 −2
Original line number Diff line number Diff line
@@ -103,10 +103,13 @@ static int ipmi_pci_probe(struct pci_dev *pdev, 
	io.addr_source_cleanup = ipmi_pci_cleanup;

	io.addr_source_data = pdev;



	if (pci_resource_flags(pdev, 0) & IORESOURCE_IO)

	if (pci_resource_flags(pdev, 0) & IORESOURCE_IO) {

		io.addr_type = IPMI_IO_ADDR_SPACE;

	else

		io.io_setup = ipmi_si_port_setup;

	} else {

		io.addr_type = IPMI_MEM_ADDR_SPACE;

		io.io_setup = ipmi_si_mem_setup;

	}

	io.addr_data = pci_resource_start(pdev, 0);



	io.regspacing = ipmi_pci_probe_regspacing(&io);