From: Aditya Pakki <pakki001@umn.edu>
Date: Sat, 5 Jan 2019 14:14:41 +0000 (-0600)
Subject: Staging: rts5208: Fix error handling on rtsx_send_cmd
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~5215^2~235
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=c8c2702409430a6a2fd928e857f15773aaafcc99;p=linux.git

Staging: rts5208: Fix error handling on rtsx_send_cmd

In sd_execute_write_data, the rtsx_send_cmd could fail with ETIMEDOUT
or EIO. The fix adds a check to handle these failures.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index 2c47ae613ea1..c256a2398651 100644
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -4437,7 +4437,12 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 		rtsx_init_cmd(chip);
 		rtsx_add_cmd(chip, CHECK_REG_CMD, 0xFD30, 0x02, 0x02);
 
-		rtsx_send_cmd(chip, SD_CARD, 250);
+		retval = rtsx_send_cmd(chip, SD_CARD, 250);
+		if (retval < 0) {
+			write_err = true;
+			rtsx_clear_sd_error(chip);
+			goto sd_execute_write_cmd_failed;
+		}
 
 		retval = sd_update_lock_status(chip);
 		if (retval != STATUS_SUCCESS) {