1 files changed, 8 insertions, 13 deletions

diff --git a/drivers/input/mouse/elan_i2c_i2c.c b/drivers/input/mouse/elan_i2c_i2c.c
index 765879dcaf85..f431da07f861 100644
--- a/drivers/input/mouse/elan_i2c_i2c.c
+++ b/drivers/input/mouse/elan_i2c_i2c.c
@@ -554,7 +554,6 @@ static int elan_i2c_finish_fw_update(struct i2c_client *client,
                                      struct completion *completion)
 {
         struct device *dev = &client->dev;
-        long ret;
         int error;
         int len;
         u8 buffer[ETP_I2C_REPORT_LEN];
@@ -570,23 +569,19 @@ static int elan_i2c_finish_fw_update(struct i2c_client *client,
         enable_irq(client->irq);
 
         error = elan_i2c_write_cmd(client, ETP_I2C_STAND_CMD, ETP_I2C_RESET);
-        if (!error)
-                ret = wait_for_completion_interruptible_timeout(completion,
-                                                        msecs_to_jiffies(300));
-        disable_irq(client->irq);
-
         if (error) {
                 dev_err(dev, "device reset failed: %d\n", error);
-                return error;
-        } else if (ret == 0) {
+        } else if (!wait_for_completion_timeout(completion,
+                                                msecs_to_jiffies(300))) {
                 dev_err(dev, "timeout waiting for device reset\n");
-                return -ETIMEDOUT;
-        } else if (ret < 0) {
-                error = ret;
-                dev_err(dev, "error waiting for device reset: %d\n", error);
-                return error;
+                error = -ETIMEDOUT;
         }
 
+        disable_irq(client->irq);
+
+        if (error)
+                return error;
+
         len = i2c_master_recv(client, buffer, ETP_I2C_INF_LENGTH);
         if (len != ETP_I2C_INF_LENGTH) {
                 error = len < 0 ? len : -EIO;