| From fb0282b74bfd6f9c13e178018400f3f92ec830e3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 6 Jun 2018 16:11:26 +0300 |
| Subject: ipmi_si_pci: fix NULL device in ipmi_si error message |
| |
| From: Meelis Roos <mroos@linux.ee> |
| |
| [ Upstream commit 01508d9ebf4fc863f2fc4561c390bf4b7c3301a6 ] |
| |
| 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: Meelis Roos <mroos@linux.ee> |
| Signed-off-by: Corey Minyard <cminyard@mvista.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/char/ipmi/ipmi_si_pci.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/char/ipmi/ipmi_si_pci.c b/drivers/char/ipmi/ipmi_si_pci.c |
| index f54ca6869ed2c..022e03634ce2a 100644 |
| --- a/drivers/char/ipmi/ipmi_si_pci.c |
| +++ b/drivers/char/ipmi/ipmi_si_pci.c |
| @@ -120,6 +120,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; |
| @@ -128,8 +130,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); |
| |
| -- |
| 2.20.1 |
| |