Skip to contentSkip to conversation

FAILED: patch "[PATCH] PCI/MSI: pci-xgene-msi: Fix CPU hotplug registration handling" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 23, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 4d191b1b63c209e37bf27938ef365244d3c41084 Mon Sep 17 00:00:00 2001

From: Marc Zyngier <[email protected]>
Date: Tue, 17 Jan 2017 14:21:56 +0000
Subject: [PATCH] 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")
CC Thomas Gleixner <[email protected]>
drivers/pci/host/pci-xgene-msi.c +1 -1
index 1f38d0836751..f1b633bce525 100644
@@ -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,