--- drivers/mmc/core/sdio.c

+++ drivers/mmc/core/sdio.c

@@ -278,6 +278,14 @@ static int mmc_sdio_init_card(struct mmc

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);

}