rsi: Suppress sdhci warnings in mmc

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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 5733e44..b412b65 100644 (file)
--- 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",