mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO
PATCH 1/1 mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO
The mmc core takes a specific path to support initializing of a non-standard SDIO card. This is triggered by looking for the card-quirk, MMC_QUIRK_NONSTD_SDIO.
In mmc_sdio_init_card() this gets rather messy, as it causes the code to bail out earlier, compared to the usual path. This leads to that the OCR doesn't get saved properly in card->ocr. Fortunately, only omap_hsmmc has been using the MMC_QUIRK_NONSTD_SDIO and is dealing with the issue, by assigning a hardcoded value (0x80) to card->ocr from an ->init_card() ops.
To make the behaviour consistent, let's instead rely on the core to save the OCR in card->ocr during initialization.
Reported-by H. Nikolaus Schaller <[email protected]>
Signed-off-by Ulf Hansson <[email protected]>
--- drivers/mmc/core/sdio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/core/sdio.c +3 -1
@@ -708,6 +708,8 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,if (host->ops->init_card) host->ops->init_card (host, card); + card->ocr = ocr_card; +/* * If the host and card support UHS-I mode request the card * to switch to 1.8V signaling level. No 1.8v signalling if
@@ -820,7 +822,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, goto mismatch; } } - card->ocr = ocr_card; +mmc_fixup_device (card, sdio_fixup_methods);if (card->type ==MMC_TYPE_SD_COMBO ) {
Signature · 1 line
2.25.1