summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorChris Ball <chris@printf.net>2014-09-04 17:11:53 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 08:47:55 -0800
commit003f558269ba36d7b3b84c7dde9a77dd3646d0a3 (patch)
treedad93600165c04cf5f220b9d5d695736ae385001 /drivers/mfd
parent315a75ea5d19a4cbc68b96024de8e36eb1db68b0 (diff)
downloadlinux-3.10-003f558269ba36d7b3b84c7dde9a77dd3646d0a3.tar.gz
linux-3.10-003f558269ba36d7b3b84c7dde9a77dd3646d0a3.tar.bz2
linux-3.10-003f558269ba36d7b3b84c7dde9a77dd3646d0a3.zip
mfd: rtsx_pcr: Fix MSI enable error handling
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/rtsx_pcr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index 45f26be359e..7e28bd0de55 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -1137,7 +1137,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;
}