On Thu, 28 Feb 2019 at 07:08, hongjiefang <hongjiefang@xxxxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/core/mmc.c | 2 ++
> drivers/mmc/core/sd.c | 5 ++++-
> drivers/mmc/core/sdio.c | 9 ++++++++-
> 3 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index da892a5..172691c 100644
> --- 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 d0d9f90..4ebc4b2 100644
> --- a/drivers/mmc/core/sd.c
> +++ b/drivers/mmc/core/sd.c
> @@ -936,8 +936,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 d8e17ea..6718fc8 100644
> --- 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;
> }
> --
> 1.9.1
>
