tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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()

Linus Torvalds ee2f6cc7 3108864e

+2 -2
unified split
+2 -2
drivers/pci/pci.c
··· 1832 1832 if (!(cap & PCI_EXP_DEVCAP_FLR)) 1833 1833 return -ENOTTY; 1834 1834 1835 - if (!dev->msi_enabled && !dev->msix_enabled) 1835 + if (!dev->msi_enabled && !dev->msix_enabled && dev->irq != 0) 1836 1836 disable_irq(dev->irq); 1837 1837 pci_save_state(dev); 1838 1838 ··· 1841 1841 r = pci_execute_reset_function(dev); 1842 1842 1843 1843 pci_restore_state(dev); 1844 - if (!dev->msi_enabled && !dev->msix_enabled) 1844 + if (!dev->msi_enabled && !dev->msix_enabled && dev->irq != 0) 1845 1845 enable_irq(dev->irq); 1846 1846 1847 1847 return r;