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

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

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

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;