Hi Philip,
On Fri, Oct 29, 2010 at 01:13:38AM -0700, Philip Rakity wrote:
> we should not call mmc_card_set_ddr_mode if we are in single data mode. This sets DDR and causes
> the print out in the 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@xxxxxxxxxxx>
>
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 995261f..37ddb0d 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -375,7 +375,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> struct mmc_card *oldcard)
> {
> struct mmc_card *card;
> - int err, ddr = MMC_SDR_MODE;
> + int err, ddr = 0 ;
> u32 cid[4];
> unsigned int max_dtr;
>
> @@ -562,7 +562,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> 1 << bus_width, ddr);
> err = 0;
> } else {
> - mmc_card_set_ddr_mode(card);
> + if (ddr)
> + mmc_card_set_ddr_mode(card);
> + else
> + ddr = MMC_SDR_MODE;
> mmc_set_bus_width_ddr(card->host, bus_width, ddr);
> }
> }
Thanks, pushed and queued for 2.6.37.
(Note, this patch was corrupt -- please fix your mailer and check that
patches apply successfully.)
--
Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/>
One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
