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

Commit 2fd322a5 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Don't panic when fetching EXT_CSD 



Instead of doing BUG_ON(), return an error code.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent c197787c

drivers/mmc/core/mmc.c

+2 −4
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ static int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd) 
	int err;

	u8 *ext_csd;



	BUG_ON(!card);

	BUG_ON(!new_ext_csd);

	if (!card || !new_ext_csd)

		return -EINVAL;



	if (!mmc_can_ext_csd(card))

		return -EOPNOTSUPP;
@@ -368,8 +368,6 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd) 
	int err = 0, idx;

	unsigned int part_size;



	BUG_ON(!card);



	/* Version is coded in the CSD_STRUCTURE byte in the EXT_CSD register */

	card->ext_csd.raw_ext_csd_structure = ext_csd[EXT_CSD_STRUCTURE];

	if (card->csd.structure == 3) {