diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2017-01-17 14:21:56 +0000 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-01-17 08:41:51 -0600 |
commit | 4d191b1b63c209e37bf27938ef365244d3c41084 (patch) | |
tree | f2ab6cdb65ddacdf2e7c019cd55e353f0c16b400 /drivers/pci/host | |
parent | 51ebfc92b72b4f7dac1ab45683bf56741e454b8c (diff) | |
download | linux-stable-4d191b1b63c209e37bf27938ef365244d3c41084.tar.gz linux-stable-4d191b1b63c209e37bf27938ef365244d3c41084.tar.bz2 linux-stable-4d191b1b63c209e37bf27938ef365244d3c41084.zip |
PCI/MSI: pci-xgene-msi: Fix CPU hotplug registration handling
The conversion to the new hotplug state machine introduced a regression
where a successful hotplug registration would be treated as an error,
effectively disabling the MSI driver forever.
Fix it by doing the proper check on the return value.
Fixes: 9c248f8896e6 ("PCI/xgene-msi: Convert to hotplug state machine")
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Tested-by: Duc Dang <dhdang@apm.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: stable@vger.kernel.org
Diffstat (limited to 'drivers/pci/host')
-rw-r--r-- | drivers/pci/host/pci-xgene-msi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c index 1f38d0836751..f1b633bce525 100644 --- a/drivers/pci/host/pci-xgene-msi.c +++ b/drivers/pci/host/pci-xgene-msi.c @@ -517,7 +517,7 @@ static int xgene_msi_probe(struct platform_device *pdev) rc = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "pci/xgene:online", xgene_msi_hwirq_alloc, NULL); - if (rc) + if (rc < 0) goto err_cpuhp; pci_xgene_online = rc; rc = cpuhp_setup_state(CPUHP_PCI_XGENE_DEAD, "pci/xgene:dead", NULL, |