diff options
| author | Chris Ball <chris@printf.net> | 2014-09-04 18:11:53 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-09-26 09:23:52 +0200 |
| commit | 5152970538a5e16c03bbcb9f1c780489a795ed40 (patch) | |
| tree | ac35cc785d4504c0ab846526b1f14020b6e8baa5 /drivers/mfd | |
| parent | mfd: ti_am335x_tscadc: Fix TSC resume (diff) | |
| download | linux-5152970538a5e16c03bbcb9f1c780489a795ed40.tar.xz linux-5152970538a5e16c03bbcb9f1c780489a795ed40.zip | |
mfd: rtsx_pcr: Fix MSI enable error handling
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
Cc: stable <stable@vger.kernel.org>
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>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/rtsx_pcr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c index d01b8c249231..f2643c221d34 100644 --- a/drivers/mfd/rtsx_pcr.c +++ b/drivers/mfd/rtsx_pcr.c @@ -1197,7 +1197,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; } |