lkml.org 
[lkml]   [2014]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 050/105] mfd: rtsx_pcr: Fix MSI enable error handling
    Date
    3.13.11.10 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chris Ball <chris@printf.net>

    commit 5152970538a5e16c03bbcb9f1c780489a795ed40 upstream.

    pci_enable_msi() can return failure with both positive and negative
    integers -- it returns 0 for success -- but is only tested here for
    "if (ret < 0)". This causes us to try to use MSI on the RTS5249 SD
    reader in the Dell XPS 11 when enabling MSI failed, causing:

    [ 1.737110] rtsx_pci: probe of 0000:05:00.0 failed with error -110

    Reported-by: D. Jared Dominguez <Jared_Dominguez@Dell.com>
    Tested-by: D. Jared Dominguez <Jared_Dominguez@Dell.com>
    Signed-off-by: Chris Ball <chris@printf.net>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/mfd/rtsx_pcr.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
    index 705698f..eb45a42 100644
    --- a/drivers/mfd/rtsx_pcr.c
    +++ b/drivers/mfd/rtsx_pcr.c
    @@ -1172,7 +1172,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
    pcr->msi_en = msi_en;
    if (pcr->msi_en) {
    ret = pci_enable_msi(pcidev);
    - if (ret < 0)
    + if (ret)
    pcr->msi_en = false;
    }

    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-27 20:41    [W:4.088 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site