Hi Takashi,

On Wed, Dec 22, 2010 at 09:59:44AM +0100, Takashi Iwai wrote:
> Subject: [PATCH] mmc: fix mmc_set_bus_width_ddr() call without bus-width-test 
> cap
> 
> With the bus-width test patch, mmc_set_bus_width*() isn't called properly
> when the driver doesn't set MMC_CAP_BUS_WIDTH and no DDR mode.
> This patch fixes the regression by moving the call up before the cap test.
> 
> Signed-off-by: Takashi Iwai <ti...@suse.de>
> ---
>  drivers/mmc/core/mmc.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 1d8409f..c86dd73 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -558,6 +558,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
>                                        EXT_CSD_BUS_WIDTH,
>                                        ext_csd_bits[idx][0]);
>                       if (!err) {
> +                             mmc_set_bus_width_ddr(card->host,
> +                                                   bus_width, MMC_SDR_MODE);
>                               /*
>                                * If controller can't handle bus width test,
>                                * use the highest bus width to maintain
> @@ -565,8 +567,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
>                                */
>                               if (!(host->caps & MMC_CAP_BUS_WIDTH_TEST))
>                                       break;
> -                             mmc_set_bus_width_ddr(card->host,
> -                                                   bus_width, MMC_SDR_MODE);
>                               err = mmc_bus_test(card, bus_width);
>                               if (!err)
>                                       break;

Thanks, I've pushed this fix to mmc-next now.

-- 
Chris Ball   <c...@laptop.org>   <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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to