commit fe75d34f2a63bba35619fb82c1ed12f297b4b5f9
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 14 14:24:14 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 14 14:24:14 2017 -0700
tree e28124511b61d2241f11cc392dc4e6a497fa878e
parent 4f0821197a9298981829999eb1babe137d587470
parent 3c3c4114cb8365303fd8ddac7c78ff409cd2d8fa

Merge "mmc: core: Workaround to fix a hardware bug in Qualcomm-SDIO client on MDM" into msm-4.9

drivers/mmc/core/sdio_cis.c

diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index dcb3dee..acb9f5e 100644
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -276,8 +276,16 @@
 			break;
 
 		/* null entries have no link field or data */
-		if (tpl_code == 0x00)
-			continue;
+		if (tpl_code == 0x00) {
+			if (card->cis.vendor == 0x70 &&
+				(card->cis.device == 0x2460 ||
+				 card->cis.device == 0x0460 ||
+				 card->cis.device == 0x23F1 ||
+				 card->cis.device == 0x23F0))
+				break;
+			else
+				continue;
+		}
 
 		ret = mmc_io_rw_direct(card, 0, 0, ptr++, 0, &tpl_link);
 		if (ret)