1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 7109d28518d3..8fb116f8a152 100644
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
@@ -219,6 +219,7 @@ static long read_local_version(struct kim_data_s *kim_gdata, char *bts_scr_name)
 {
         unsigned short version = 0, chip = 0, min_ver = 0, maj_ver = 0;
         const char read_ver_cmd[] = { 0x01, 0x01, 0x10, 0x00 };
+        long timeout;
 
         pr_debug("%s", __func__);
 
@@ -228,10 +229,11 @@ static long read_local_version(struct kim_data_s *kim_gdata, char *bts_scr_name)
                 return -EIO;
         }
 
-        if (!wait_for_completion_interruptible_timeout(
-                &kim_gdata->kim_rcvd, msecs_to_jiffies(CMD_RESP_TIME))) {
-                pr_err(" waiting for ver info- timed out ");
-                return -ETIMEDOUT;
+        timeout = wait_for_completion_interruptible_timeout(
+                &kim_gdata->kim_rcvd, msecs_to_jiffies(CMD_RESP_TIME));
+        if (timeout <= 0) {
+                pr_err(" waiting for ver info- timed out or received signal");
+                return timeout ? -ERESTARTSYS : -ETIMEDOUT;
         }
         reinit_completion(&kim_gdata->kim_rcvd);
         /* the positions 12 & 13 in the response buffer provide with the
@@ -395,13 +397,14 @@ static long download_firmware(struct kim_data_s *kim_gdata)
                         break;
                 case ACTION_WAIT_EVENT:  /* wait */
                         pr_debug("W");
-                        if (!wait_for_completion_interruptible_timeout(
+                        err = wait_for_completion_interruptible_timeout(
                                         &kim_gdata->kim_rcvd,
-                                        msecs_to_jiffies(CMD_RESP_TIME))) {
-                                pr_err("response timeout during fw download ");
+                                        msecs_to_jiffies(CMD_RESP_TIME));
+                        if (err <= 0) {
+                                pr_err("response timeout/signaled during fw download ");
                                 /* timed out */
                                 release_firmware(kim_gdata->fw_entry);
-                                return -ETIMEDOUT;
+                                return err ? -ERESTARTSYS : -ETIMEDOUT;
                         }
                         reinit_completion(&kim_gdata->kim_rcvd);
                         break;