Commit 0aab3995 authored Mar 01, 2011 by Stefan Nilsson XK Committed by Chris Ball Mar 17, 2011

mmc: sdio: remember new card RCA when redetecting card



During redetection of a SDIO card, a request for a new card RCA
was submitted to the card, but was then overwritten by the old RCA.
This caused the card to be deselected instead of selected when using
the incorrect RCA.  This bug's been present since the "oldcard"
handling was introduced in 2.6.32.

Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com>
Reviewed-by: Ulf Hansson <ulf.hansson@stericsson.com>
Reviewed-by: Pawel Wieczorkiewicz <pawel.wieczorkiewicz@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Cc: <stable@kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent ba6a902d

drivers/mmc/core/sdio.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -395,6 +395,14 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
		if (err)
		goto remove;

		/*
		* Update oldcard with the new RCA received from the SDIO
		* device -- we're doing this so that it's updated in the
		* "card" struct when oldcard overwrites that later.
		*/
		if (oldcard)
		oldcard->rca = card->rca;

		mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
		}

Admin message