Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee2f6cc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 3108864e 1df8fb3d

drivers/pci/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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;