mmc: Fix printing of card DDR type
We should not call mmc_card_set_ddr_mode() if we are in single data mode. This sets DDR and causes the kernel log to say the card is DDR when it is not. Explicitly set ddr to 0 rather then rely on MMC_SDR_MODE being 0 when doing the checks. Signed-off-by: Philip Rakity <prakity@marvell.com> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
151f52f09c
commit
25d5c699f9
|
@ -375,7 +375,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
|
||||||
struct mmc_card *oldcard)
|
struct mmc_card *oldcard)
|
||||||
{
|
{
|
||||||
struct mmc_card *card;
|
struct mmc_card *card;
|
||||||
int err, ddr = MMC_SDR_MODE;
|
int err, ddr = 0;
|
||||||
u32 cid[4];
|
u32 cid[4];
|
||||||
unsigned int max_dtr;
|
unsigned int max_dtr;
|
||||||
|
|
||||||
|
@ -562,7 +562,11 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
|
||||||
1 << bus_width, ddr);
|
1 << bus_width, ddr);
|
||||||
err = 0;
|
err = 0;
|
||||||
} else {
|
} else {
|
||||||
|
if (ddr)
|
||||||
mmc_card_set_ddr_mode(card);
|
mmc_card_set_ddr_mode(card);
|
||||||
|
else
|
||||||
|
ddr = MMC_SDR_MODE;
|
||||||
|
|
||||||
mmc_set_bus_width_ddr(card->host, bus_width, ddr);
|
mmc_set_bus_width_ddr(card->host, bus_width, ddr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue