From 8e1d14ce488f09b900643b1940d1e35a3068dd57 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 4 Apr 2013 21:34:11 +0200
Subject: [PATCH] --- yaml --- r: 373179 b: refs/heads/master c:
 9d66b568a215fe2da2a9db736ebf9b8d66082d88 h: refs/heads/master i:   373177:
 41af2381d1f8432cf320f05053e83d3a00ff92b3   373175:
 c74085dd8cfa68b47f5a5d711d30d0d425b12d0e v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mfd/rtsx_pcr.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9f2b3732033e..2c932b15095a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58eb893da99815ebdeee6cb3eeac897b99a246f7
+refs/heads/master: 9d66b568a215fe2da2a9db736ebf9b8d66082d88
diff --git a/trunk/drivers/mfd/rtsx_pcr.c b/trunk/drivers/mfd/rtsx_pcr.c
index 2f12cc13489a..578a1136b6dc 100644
--- a/trunk/drivers/mfd/rtsx_pcr.c
+++ b/trunk/drivers/mfd/rtsx_pcr.c
@@ -1138,7 +1138,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
 
 	ret = rtsx_pci_acquire_irq(pcr);
 	if (ret < 0)
-		goto free_dma;
+		goto disable_msi;
 
 	pci_set_master(pcidev);
 	synchronize_irq(pcr->irq);
@@ -1162,7 +1162,9 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
 
 disable_irq:
 	free_irq(pcr->irq, (void *)pcr);
-free_dma:
+disable_msi:
+	if (pcr->msi_en)
+		pci_disable_msi(pcr->pci);
 	dma_free_coherent(&(pcr->pci->dev), RTSX_RESV_BUF_LEN,
 			pcr->rtsx_resv_buf, pcr->rtsx_resv_buf_addr);
 unmap: