linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dan O'Donovan <dan@emutex.com>
To: ulf.hansson@linaro.org
Cc: linux-mmc@vger.kernel.org, arnd@arndb.de, Dan O'Donovan <dan@emutex.com>
Subject: [PATCH] mmc: mmc: fix check on mmc_select_bus_width return value
Date: Wed,  1 Jun 2016 13:17:15 +0100	[thread overview]
Message-ID: <1464783435-19338-1-git-send-email-dan@emutex.com> (raw)

This fixes a bug introduced by commit 287980e49ffc ("remove lots of
IS_ERR_VALUE abuses").  mmc_select_bus_width can return positive
integer values upon success, so the (!err) check is incorrect here.
This causes mmc initialisation failure, and subsequently boot
failure, on some platforms.

Signed-off-by: Dan O'Donovan <dan@emutex.com>
---
 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 c984321..5d438ad 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) {
+	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) {
+		if (err >= 0) {
 			err = mmc_select_hs_ddr(card);
 			if (err)
 				goto free_card;
-- 
2.1.4


             reply	other threads:[~2016-06-01 12:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20160601121538epcas1p1dbeabd6d68d9ca32e1a24705aee0f07a@epcas1p1.samsung.com>
2016-06-01 12:17 ` Dan O'Donovan [this message]
2016-06-01 12:43   ` [PATCH] mmc: mmc: fix check on mmc_select_bus_width return value Jaehoon Chung
2016-06-01 12:54     ` Dan O'Donovan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1464783435-19338-1-git-send-email-dan@emutex.com \
    --to=dan@emutex.com \
    --cc=arnd@arndb.de \
    --cc=linux-mmc@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).