瀏覽代碼

mmc: core: Only change mode if mmc_select_bus_width() is successful

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.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Peter Griffin 9 年之前
父節點
當前提交
8b7be8f2e7
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/mmc/core/mmc.c

+ 2 - 2
drivers/mmc/core/mmc.c

@@ -1334,7 +1334,7 @@ static int mmc_select_hs200(struct mmc_card *card)
 	 * switch to HS200 mode if bus width is set successfully.
 	 * switch to HS200 mode if bus width is set successfully.
 	 */
 	 */
 	err = mmc_select_bus_width(card);
 	err = mmc_select_bus_width(card);
-	if (err >= 0) {
+	if (err > 0) {
 		val = EXT_CSD_TIMING_HS200 |
 		val = EXT_CSD_TIMING_HS200 |
 		      card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
 		      card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
 		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
 		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
@@ -1642,7 +1642,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 	} else if (mmc_card_hs(card)) {
 	} else if (mmc_card_hs(card)) {
 		/* Select the desired bus width optionally */
 		/* Select the desired bus width optionally */
 		err = mmc_select_bus_width(card);
 		err = mmc_select_bus_width(card);
-		if (err >= 0) {
+		if (err > 0) {
 			err = mmc_select_hs_ddr(card);
 			err = mmc_select_hs_ddr(card);
 			if (err)
 			if (err)
 				goto free_card;
 				goto free_card;