Commit 01508d9e authored by Meelis Roos's avatar Meelis Roos Committed by Corey Minyard
Browse files

ipmi_si_pci: fix NULL device in ipmi_si error message 



I noticed that 4.17.0 logs the follwing during ipmi_si setup:

 ipmi_si 0000:01:04.6: probing via PCI
 (NULL device *): Could not setup I/O space
 ipmi_si 0000:01:04.6: [mem 0xf5ef0000-0xf5ef00ff] regsize 1 spacing 1 irq 21

Fix the "NULL device *) by moving io.dev assignment before its potential
use by ipmi_pci_probe_regspacing().

Result:
 ipmi_si 0000:01:04.6: probing via PCI
 ipmi_si 0000:01:04.6: Could not setup I/O space
 ipmi_si 0000:01:04.6: [mem 0xf5ef0000-0xf5ef00ff] regsize 1 spacing 1 irq 21

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

drivers/char/ipmi/ipmi_si_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ static int ipmi_pci_probe(struct pci_dev *pdev, 
	}

	io.addr_data = pci_resource_start(pdev, 0);



	io.dev = &pdev->dev;



	io.regspacing = ipmi_pci_probe_regspacing(&io);

	io.regsize = DEFAULT_REGSIZE;

	io.regshift = 0;
@@ -123,8 +125,6 @@ static int ipmi_pci_probe(struct pci_dev *pdev, 
	if (io.irq)

		io.irq_setup = ipmi_std_irq_setup;



	io.dev = &pdev->dev;



	dev_info(&pdev->dev, "%pR regsize %d spacing %d irq %d\n",

		 &pdev->resource[0], io.regsize, io.regspacing, io.irq);