diff mbox

mmc: core: fix the wrong error control

Message ID 1464594014-31934-1-git-send-email-jh80.chung@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jaehoon Chung May 30, 2016, 7:40 a.m. UTC
After applied "remove lots of IS_ERR_VALUE abuses", it shoold be
misoperation. (commit 287980e49)
If mmc_bus_test is successful, it returned the bus-witdh bit.

The below log is error log
[    2.542260] mmc0: mmc_select_hs200 failed, error 3
[    2.542275] mmc0: error 3 whilst initialising MMC card

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/mmc/core/mmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Shawn Lin May 30, 2016, 9:45 a.m. UTC | #1
Hi,

在 2016/5/30 15:40, Jaehoon Chung 写道:
> After applied "remove lots of IS_ERR_VALUE abuses", it shoold be
> misoperation. (commit 287980e49)
> If mmc_bus_test is successful, it returned the bus-witdh bit.
>
> The below log is error log
> [    2.542260] mmc0: mmc_select_hs200 failed, error 3
> [    2.542275] mmc0: error 3 whilst initialising MMC card
>

The same as this patch[0]?

[0]https://patchwork.kernel.org/patch/9139673/

> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.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..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) {
> +	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;
>

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jaehoon Chung May 31, 2016, 1 a.m. UTC | #2
On 05/30/2016 06:45 PM, Shawn Lin wrote:
> Hi,
> 
> 在 2016/5/30 15:40, Jaehoon Chung 写道:
>> After applied "remove lots of IS_ERR_VALUE abuses", it shoold be
>> misoperation. (commit 287980e49)
>> If mmc_bus_test is successful, it returned the bus-witdh bit.
>>
>> The below log is error log
>> [    2.542260] mmc0: mmc_select_hs200 failed, error 3
>> [    2.542275] mmc0: error 3 whilst initialising MMC card
>>
> 
> The same as this patch[0]?

Yes, discard this patch. Thanks for noticing this.

Best Regards,
Jaehoon Chung

> 
> [0]https://patchwork.kernel.org/patch/9139673/
> 
>> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.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..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) {
>> +    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;
>>
> 
> -- 
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index c984321..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) {
+	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;