Commit 78538bae authored by Meelis Roos's avatar Meelis Roos Committed by Greg Kroah-Hartman

ipmi_si_pci: fix NULL device in ipmi_si error message

[ Upstream commit 01508d9e ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5ab64c16
...@@ -120,6 +120,8 @@ static int ipmi_pci_probe(struct pci_dev *pdev, ...@@ -120,6 +120,8 @@ static int ipmi_pci_probe(struct pci_dev *pdev,
} }
io.addr_data = pci_resource_start(pdev, 0); io.addr_data = pci_resource_start(pdev, 0);
io.dev = &pdev->dev;
io.regspacing = ipmi_pci_probe_regspacing(&io); io.regspacing = ipmi_pci_probe_regspacing(&io);
io.regsize = DEFAULT_REGSIZE; io.regsize = DEFAULT_REGSIZE;
io.regshift = 0; io.regshift = 0;
...@@ -128,8 +130,6 @@ static int ipmi_pci_probe(struct pci_dev *pdev, ...@@ -128,8 +130,6 @@ static int ipmi_pci_probe(struct pci_dev *pdev,
if (io.irq) if (io.irq)
io.irq_setup = ipmi_std_irq_setup; io.irq_setup = ipmi_std_irq_setup;
io.dev = &pdev->dev;
dev_info(&pdev->dev, "%pR regsize %d spacing %d irq %d\n", dev_info(&pdev->dev, "%pR regsize %d spacing %d irq %d\n",
&pdev->resource[0], io.regsize, io.regspacing, io.irq); &pdev->resource[0], io.regsize, io.regspacing, io.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