Re: [PATCH v2] mmc: core: Only change mode if mmc_select_bus_width() is successful.
From: Ulf Hansson
Date: Wed Jun 22 2016 - 11:23:20 EST
On 8 June 2016 at 12:27, Peter Griffin <peter.griffin@xxxxxxxxxx> wrote:
> mmc_select_bus_width() returns bus width (4 or 8) on success or
> zero if unsupported. So only change mode if setting the bus width
> is successful.
>
> Fixes f741494 mmc: fix mmc mode selection for HS-DDR and higher
> Fixes: 287980e (remove lots of IS_ERR_VALUE abuses)
>
> Signed-off-by: Peter Griffin <peter.griffin@xxxxxxxxxx>
> Cc: Chen-Yu Tsai <wens@xxxxxxxx>
> Cc: Arnd Bergmann <arnd@xxxxxxxx>
>
Thanks, applied for next! Updated the changelog to remove the "fixes"
tags and the Cc, as those shouldn't be relevant.
Kind regards
Uffe
> ---
>
> v2: Rebase on v4.7-rc2 which includes a fix from Chen-Yu and update
> commit message.
> ---
> drivers/mmc/core/mmc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 5d438ad..aafb73d 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card *card)
> * switch to HS200 mode if bus width is set successfully.
> */
> err = mmc_select_bus_width(card);
> - if (err >= 0) {
> + if (err > 0) {
> val = EXT_CSD_TIMING_HS200 |
> card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
> err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
> @@ -1583,7 +1583,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> } else if (mmc_card_hs(card)) {
> /* Select the desired bus width optionally */
> err = mmc_select_bus_width(card);
> - if (err >= 0) {
> + if (err > 0) {
> err = mmc_select_hs_ddr(card);
> if (err)
> goto free_card;
> --
> 1.9.1
>