staging:rts_pstor:Fix SDIO issue

Fix a bug that SDIO and SD normal card would appear simultaneously if a SDIO card inserted.

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rts_pstor/sd.c b/drivers/staging/rts_pstor/sd.c
index fb62eafe4fcd76eae9185af73b22ec6c7c63ebf8..aab690932eae7f1d4a33324e0e180c590ce02d53 100644 (file)
--- a/drivers/staging/rts_pstor/sd.c
+++ b/drivers/staging/rts_pstor/sd.c
@@ -3134,41 +3134,40 @@ int reset_sd_card(struct rtsx_chip *chip)
 
        if (chip->sd_ctl & RESET_MMC_FIRST) {
                retval = reset_mmc(chip);
-               if ((retval != STATUS_SUCCESS) && !sd_check_err_code(chip, SD_NO_CARD)) {
+               if (retval != STATUS_SUCCESS) {
+                       if (sd_check_err_code(chip, SD_NO_CARD))
+                               TRACE_RET(chip, STATUS_FAIL);
+
                        retval = reset_sd(chip);
                        if (retval != STATUS_SUCCESS) {
-                               if (CHECK_PID(chip, 0x5209)) {
-                                       retval = sd_change_bank_voltage(chip, SD_IO_3V3);
-                                       if (retval != STATUS_SUCCESS) {
-                                               TRACE_RET(chip, STATUS_FAIL);
-                                       }
-                               }
+                               if (CHECK_PID(chip, 0x5209))
+                                       sd_change_bank_voltage(chip, SD_IO_3V3);
+
+                               TRACE_RET(chip, STATUS_FAIL);
                        }
                }
        } else {
                retval = reset_sd(chip);
                if (retval != STATUS_SUCCESS) {
-                       if (sd_check_err_code(chip, SD_NO_CARD)) {
+                       if (sd_check_err_code(chip, SD_NO_CARD))
                                TRACE_RET(chip, STATUS_FAIL);
-                       }
 
                        if (CHECK_PID(chip, 0x5209)) {
                                retval = sd_change_bank_voltage(chip, SD_IO_3V3);
-                               if (retval != STATUS_SUCCESS) {
+                               if (retval != STATUS_SUCCESS)
                                        TRACE_RET(chip, STATUS_FAIL);
-                               }
                        }
 
-                       if (!chip->sd_io) {
+                       if (chip->sd_io) {
+                               TRACE_RET(chip, STATUS_FAIL);
+                       } else {
                                retval = reset_mmc(chip);
+                               if (retval != STATUS_SUCCESS)
+                                       TRACE_RET(chip, STATUS_FAIL);
                        }
                }
        }
 
-       if (retval != STATUS_SUCCESS) {
-               TRACE_RET(chip, STATUS_FAIL);
-       }
-
        retval = sd_set_clock_divider(chip, SD_CLK_DIVIDE_0);
        if (retval != STATUS_SUCCESS) {
                TRACE_RET(chip, STATUS_FAIL);