Commit 1df8fb3d authored by Sheng Yang's avatar Sheng Yang Committed by Jesse Barnes

PCI: Fix disable IRQ 0 in pci_reset_function()

Before initialization, dev->irq may be zero. Make sure we don't disable
it at reset time in that case.
Reviewed-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 7f0f598a
...@@ -1832,7 +1832,7 @@ int pci_reset_function(struct pci_dev *dev) ...@@ -1832,7 +1832,7 @@ int pci_reset_function(struct pci_dev *dev)
if (!(cap & PCI_EXP_DEVCAP_FLR)) if (!(cap & PCI_EXP_DEVCAP_FLR))
return -ENOTTY; return -ENOTTY;
if (!dev->msi_enabled && !dev->msix_enabled) if (!dev->msi_enabled && !dev->msix_enabled && dev->irq != 0)
disable_irq(dev->irq); disable_irq(dev->irq);
pci_save_state(dev); pci_save_state(dev);
...@@ -1841,7 +1841,7 @@ int pci_reset_function(struct pci_dev *dev) ...@@ -1841,7 +1841,7 @@ int pci_reset_function(struct pci_dev *dev)
r = pci_execute_reset_function(dev); r = pci_execute_reset_function(dev);
pci_restore_state(dev); pci_restore_state(dev);
if (!dev->msi_enabled && !dev->msix_enabled) if (!dev->msi_enabled && !dev->msix_enabled && dev->irq != 0)
enable_irq(dev->irq); enable_irq(dev->irq);
return r; return r;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment