Commit 09b59829 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.6-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.7.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 4b9b9476 84ee19bf

drivers/mmc/core/mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int mmc_decode_cid(struct mmc_card *card) 
	case 3: /* MMC v3.1 - v3.3 */

	case 4: /* MMC v4 */

		card->cid.manfid	= UNSTUFF_BITS(resp, 120, 8);

		card->cid.oemid		= UNSTUFF_BITS(resp, 104, 16);

		card->cid.oemid		= UNSTUFF_BITS(resp, 104, 8);

		card->cid.prod_name[0]	= UNSTUFF_BITS(resp, 96, 8);

		card->cid.prod_name[1]	= UNSTUFF_BITS(resp, 88, 8);

		card->cid.prod_name[2]	= UNSTUFF_BITS(resp, 80, 8);