lkml.org 
[lkml]   [2013]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC 01/77] PCI/MSI: Fix return value when populate_msi_sysfs() failed
    Date
    Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
    ---
    drivers/pci/msi.c | 11 +++++------
    1 files changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
    index d5f90d6..b43f391 100644
    --- a/drivers/pci/msi.c
    +++ b/drivers/pci/msi.c
    @@ -719,7 +719,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
    @@ -732,10 +732,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);
    @@ -746,7 +744,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
    @@ -763,6 +761,7 @@ error:
    ret = avail;
    }

    +out_free:
    free_msi_irqs(dev);

    return ret;
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2013-10-02 21:21    [W:4.042 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site