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: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Tejun Heo <tj@kernel.org>

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index f88fa127780241890278c5b1241f2ee2299ce6c6..a581381e02f27789d287fc18855488194d5348df 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -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 @@ error:
                        ret = avail;
        }
 
+out_free:
        free_msi_irqs(dev);
 
        return ret;