diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 03:57:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 03:57:16 +0100 |
| commit | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (patch) | |
| tree | 93c9e6929891c9541060b5933a8f1f73bc8efe7b | |
| parent | Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/... (diff) | |
| parent | PCI: Fix disable IRQ 0 in pci_reset_function() (diff) | |
| download | linux-ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871.tar.xz linux-ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871.zip | |
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()
Diffstat (limited to '')
| -rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 21f2ac639cab..28af496b441e 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1832,7 +1832,7 @@ int pci_reset_function(struct pci_dev *dev) if (!(cap & PCI_EXP_DEVCAP_FLR)) return -ENOTTY; - if (!dev->msi_enabled && !dev->msix_enabled) + if (!dev->msi_enabled && !dev->msix_enabled && dev->irq != 0) disable_irq(dev->irq); pci_save_state(dev); @@ -1841,7 +1841,7 @@ int pci_reset_function(struct pci_dev *dev) r = pci_execute_reset_function(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); return r; |