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

Commit 91b4adc9 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
parents 2c0503f2 866d5417

drivers/pci/pci.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1192,6 +1192,9 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars) 
		return err;

		return err;

	pci_fixup_device(pci_fixup_enable, dev);

	pci_fixup_device(pci_fixup_enable, dev);





	if (dev->msi_enabled || dev->msix_enabled)

		return 0;



	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);

	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);

	if (pin) {

	if (pin) {

		pci_read_config_word(dev, PCI_COMMAND, &cmd);

		pci_read_config_word(dev, PCI_COMMAND, &cmd);