Revert "pci/hotplug/pnv_php: Fix hotplug driver crash on Powernv"
This reverts commit 967ec9a044
.
This commit is contained in:
parent
6eb656e2e3
commit
4c6495b3d4
1 changed files with 2 additions and 1 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Reference in a new issue