Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 099b6481 authored by hongjiefang's avatar hongjiefang Committed by Ulf Hansson
Browse files

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: default avatarhongjiefang <hongjiefang@asrmicro.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 82b62487

drivers/mmc/core/mmc.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

		}

drivers/mmc/core/sd.c

+4 −1
Original line number Diff line number Diff line
@@ -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 {

drivers/mmc/core/sdio.c

+8 −1
Original line number Diff line number Diff line
@@ -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;

	}