From 4c6495b3d4afb45c591d13130b46725b4ba2a49f Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:40 +0100 Subject: [PATCH] Revert "pci/hotplug/pnv_php: Fix hotplug driver crash on Powernv" This reverts commit 967ec9a04410de43b5fca1ad1957f20fc70a1e0c. --- drivers/pci/hotplug/pnv_php.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c index cf9c0e75f..04565162a 100755 --- a/drivers/pci/hotplug/pnv_php.c +++ b/drivers/pci/hotplug/pnv_php.c @@ -38,6 +38,7 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot, bool disable_device) { struct pci_dev *pdev = php_slot->pdev; + int irq = php_slot->irq; u16 ctrl; if (php_slot->irq > 0) { @@ -56,7 +57,7 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot, php_slot->wq = NULL; } - if (disable_device) { + if (disable_device || irq > 0) { if (pdev->msix_enabled) pci_disable_msix(pdev); else if (pdev->msi_enabled)