mmc: core: Add a debug print when the card may have been replaced

If the card was removed in suspended state and a new one was inserted,
print a debug log when the check detects that it's not the old card.

Signed-off-by: hongjiefang <hongjiefang@asrmicro.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 09c688f5ff655d795790d398a13369585368d5ec..3e786ba204c3fd63a4f6b10b9f7acefb41276a88 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1594,6 +1594,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 
        if (oldcard) {
                if (memcmp(cid, oldcard->raw_cid, sizeof(cid)) != 0) {
+                       pr_debug("%s: Perhaps the card was replaced\n",
+                               mmc_hostname(host));
                        err = -ENOENT;
                        goto err;
                }

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 2b4fc2205b535b84b6382e04d432a18bf98fb995..265e1aeeb9d889c0cdfb33c0524d8504c085c2ef 100644 (file)
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -951,8 +951,11 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
                return err;
 
        if (oldcard) {
-               if (memcmp(cid, oldcard->raw_cid, sizeof(cid)) != 0)
+               if (memcmp(cid, oldcard->raw_cid, sizeof(cid)) != 0) {
+                       pr_debug("%s: Perhaps the card was replaced\n",
+                               mmc_hostname(host));
                        return -ENOENT;
+               }
 
                card = oldcard;
        } else {

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index d8e17ea6126de8339beddd776702e5aa3c0691d5..6718fc8bb40fdccb197b057440c37f6981161dea 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -617,6 +617,8 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
                if (oldcard && (oldcard->type != MMC_TYPE_SD_COMBO ||
                    memcmp(card->raw_cid, oldcard->raw_cid, sizeof(card->raw_cid)) != 0)) {
                        mmc_remove_card(card);
+                       pr_debug("%s: Perhaps the card was replaced\n",
+                               mmc_hostname(host));
                        return -ENOENT;
                }
        } else {
@@ -624,6 +626,8 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
 
                if (oldcard && oldcard->type != MMC_TYPE_SDIO) {
                        mmc_remove_card(card);
+                       pr_debug("%s: Perhaps the card was replaced\n",
+                               mmc_hostname(host));
                        return -ENOENT;
                }
        }
@@ -736,8 +740,11 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
                int same = (card->cis.vendor == oldcard->cis.vendor &&
                            card->cis.device == oldcard->cis.device);
                mmc_remove_card(card);
-               if (!same)
+               if (!same) {
+                       pr_debug("%s: Perhaps the card was replaced\n",
+                               mmc_hostname(host));
                        return -ENOENT;
+               }
 
                card = oldcard;
        }