Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mfd: rtsx_pcr: Fix MSI enable error handling

Browse Source 
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>
This commit is contained in:
Chris Ball 2014-09-04 17:11:53 +01:00 committed by Lee Jones
parent 6a71f38dd8
commit 5152970538
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mfd/rtsx_pcr.c
View File

@ -1197,7 +1197,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
pcr->msi_en = msi_en; pcr->msi_en = msi_en;
if (pcr->msi_en) { if (pcr->msi_en) {
ret = pci_enable_msi(pcidev); ret = pci_enable_msi(pcidev);
if (ret < 0) if (ret)
pcr->msi_en = false; pcr->msi_en = false;
} }