提交 ee2f6cc7 编写于 作者: L Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: Fix disable IRQ 0 in pci_reset_function()
...@@ -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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册