فهرست منبع

mmc: core: Add error message when switching fails in mmc_select_hs()

The switch failure message in mmc_select_timing() had been removed
since that is invalid: commit 0400ed0a083a ("mmc: core: remove the
invalid message in mmc_select_timing")

Now, in the case when mmc_select_hs() return error in mmc_select_timing(),
there is nothing to print failure message.
Let's make for mmc_select_hs() print message itself in the failure case.

Signed-off-by: Jungseung Lee <js07.lee@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Jungseung Lee 9 سال پیش
والد
کامیت
67d35960f4
1فایلهای تغییر یافته به همراه5 افزوده شده و 4 حذف شده
  1. 5 4
      drivers/mmc/core/mmc.c

+ 5 - 4
drivers/mmc/core/mmc.c

@@ -1029,6 +1029,10 @@ static int mmc_select_hs(struct mmc_card *card)
 		err = mmc_switch_status(card);
 		err = mmc_switch_status(card);
 	}
 	}
 
 
+	if (err)
+		pr_warn("%s: switch to high-speed failed, err:%d\n",
+			mmc_hostname(card->host), err);
+
 	return err;
 	return err;
 }
 }
 
 
@@ -1265,11 +1269,8 @@ static int mmc_select_hs400es(struct mmc_card *card)
 
 
 	/* Switch card to HS mode */
 	/* Switch card to HS mode */
 	err = mmc_select_hs(card);
 	err = mmc_select_hs(card);
-	if (err) {
-		pr_err("%s: switch to high-speed failed, err:%d\n",
-			mmc_hostname(host), err);
+	if (err)
 		goto out_err;
 		goto out_err;
-	}
 
 
 	err = mmc_switch_status(card);
 	err = mmc_switch_status(card);
 	if (err)
 	if (err)