diff mbox series

rsi: Suppress sdhci warnings in mmc

Message ID 1547803087-2767-1-git-send-email-siva8118@gmail.com (mailing list archive)
State Accepted
Commit 1e1b4161e85971c5644d627fc174a4502907d563
Delegated to: Kalle Valo
Headers show
Series rsi: Suppress sdhci warnings in mmc | expand

Commit Message

Siva Rebbagondla Jan. 18, 2019, 9:18 a.m. UTC 
From: Siva Rebbagondla <siva.rebbagondla@redpinesignals.com>

while inserting and removing sdio module multiple times, we are getting
sdhci warnings. This is because, improper assignment of ocr_avail value.
Fixed this by assigning proper value.

This patch is enhancement for commit 78e450719c702 ("rsi: Fix 'invalid
vdd' warning in mmc").

Signed-off-by: Siva Rebbagondla <siva.rebbagondla@redpinesignals.com>
---
 drivers/net/wireless/rsi/rsi_91x_sdio.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

Comments

Kalle Valo Feb. 1, 2019, 12:27 p.m. UTC | #1 
Siva Rebbagondla <siva8118@gmail.com> wrote:

> From: Siva Rebbagondla <siva.rebbagondla@redpinesignals.com>
> 
> while inserting and removing sdio module multiple times, we are getting
> sdhci warnings. This is because, improper assignment of ocr_avail value.
> Fixed this by assigning proper value.
> 
> This patch is enhancement for commit 78e450719c702 ("rsi: Fix 'invalid
> vdd' warning in mmc").
> 
> Signed-off-by: Siva Rebbagondla <siva.rebbagondla@redpinesignals.com>

Patch applied to wireless-drivers-next.git, thanks.

1e1b4161e859 rsi: Suppress sdhci warnings in mmc
diff mbox series

Patch

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 5733e44..b412b65e 100644
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -230,16 +230,19 @@  static void rsi_reset_card(struct sdio_func *pfunction)
 		rsi_dbg(ERR_ZONE, "%s: CMD0 failed : %d\n", __func__, err);
 
 	/* Issue CMD5, arg = 0 */
-	err = rsi_issue_sdiocommand(pfunction,	SD_IO_SEND_OP_COND, 0,
-				    (MMC_RSP_R4 | MMC_CMD_BCR), &resp);
-	if (err)
-		rsi_dbg(ERR_ZONE, "%s: CMD5 failed : %d\n", __func__, err);
-	card->ocr = resp;
+	if (!host->ocr_avail) {
+		err = rsi_issue_sdiocommand(pfunction,	SD_IO_SEND_OP_COND, 0,
+					    (MMC_RSP_R4 | MMC_CMD_BCR), &resp);
+		if (err)
+			rsi_dbg(ERR_ZONE, "%s: CMD5 failed : %d\n",
+				__func__, err);
 
+		host->ocr_avail = resp;
+	}
 	/* Issue CMD5, arg = ocr. Wait till card is ready  */
 	for (i = 0; i < 100; i++) {
 		err = rsi_issue_sdiocommand(pfunction, SD_IO_SEND_OP_COND,
-					    card->ocr,
+					    host->ocr_avail,
 					    (MMC_RSP_R4 | MMC_CMD_BCR), &resp);
 		if (err) {
 			rsi_dbg(ERR_ZONE, "%s: CMD5 failed : %d\n",