Commit 3d93576e authored by Subhash Jadavani's avatar Subhash Jadavani Committed by Chris Ball
Browse files

mmc: core: skip card initialization if power class selection fails 



With current implementation of power class selection,
mmc_select_powerclass() should never fail. So treat any error
returned by this function as serious enough to skip the card
initialization.

Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Reviewed-by: default avatarNamjae Jeon <linkinjeon@gmail.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 10942aa4

drivers/mmc/core/mmc.c

+7 −11
Original line number Diff line number Diff line
@@ -719,6 +719,10 @@ static int mmc_select_powerclass(struct mmc_card *card, 
				 card->ext_csd.generic_cmd6_time);

	}



	if (err)

		pr_err("%s: power class selection for ext_csd_bus_width %d"

		       " failed\n", mmc_hostname(card->host), bus_width);



	return err;

}
@@ -1102,9 +1106,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
				EXT_CSD_BUS_WIDTH_8 : EXT_CSD_BUS_WIDTH_4;

		err = mmc_select_powerclass(card, ext_csd_bits, ext_csd);

		if (err)

			pr_warning("%s: power class selection to bus width %d"

				   " failed\n", mmc_hostname(card->host),

				   1 << bus_width);

			goto err;

	}



	/*
@@ -1136,10 +1138,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
			err = mmc_select_powerclass(card, ext_csd_bits[idx][0],

						    ext_csd);

			if (err)

				pr_warning("%s: power class selection to "

					   "bus width %d failed\n",

					   mmc_hostname(card->host),

					   1 << bus_width);

				goto err;



			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

					 EXT_CSD_BUS_WIDTH,
@@ -1167,10 +1166,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
			err = mmc_select_powerclass(card, ext_csd_bits[idx][1],

						    ext_csd);

			if (err)

				pr_warning("%s: power class selection to "

					   "bus width %d ddr %d failed\n",

					   mmc_hostname(card->host),

					   1 << bus_width, ddr);

				goto err;



			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

					 EXT_CSD_BUS_WIDTH,

CRA Git | Maintained and supported by SUSTech CRA and CCSE