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

Commit 2adc7907 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Bjorn Helgaas
Browse files

PCI/MSI: Return msix_capability_init() failure if populate_msi_sysfs() fails 



If populate_msi_sysfs() function failed msix_capability_init() must return
the error code, but it returns the success instead.  This update fixes the
described misbehaviour.

Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarTejun Heo <tj@kernel.org>
parent 57b7cb02

drivers/pci/msi.c

+5 −6
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ static int msix_capability_init(struct pci_dev *dev, 


	ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX);

	if (ret)

		goto error;

		goto out_avail;



	/*

	 * Some devices require MSI-X to be enabled before we can touch the
@@ -762,10 +762,8 @@ static int msix_capability_init(struct pci_dev *dev, 
	msix_program_entries(dev, entries);



	ret = populate_msi_sysfs(dev);

	if (ret) {

		ret = 0;

		goto error;

	}

	if (ret)

		goto out_free;



	/* Set MSI-X enabled bits and unmask the function */

	pci_intx_for_msi(dev, 0);
@@ -776,7 +774,7 @@ static int msix_capability_init(struct pci_dev *dev, 


	return 0;



error:

out_avail:

	if (ret < 0) {

		/*

		 * If we had some success, report the number of irqs
@@ -793,6 +791,7 @@ static int msix_capability_init(struct pci_dev *dev, 
			ret = avail;

	}



out_free:

	free_msi_irqs(dev);



	return ret;