Browse Source

staging: typec: fusb302: reset i2c_busy state in error

Fix reset of i2c_busy flag if an error occurs during the i2c block read.

Signed-off-by: Rui Miguel Silva <rmfrfs@gmail.com>
Acked-by: Yueyao Zhu <yueyao.zhu@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rui Miguel Silva 8 years ago
parent
commit
f0d39a179b
1 changed files with 4 additions and 2 deletions
  1. 4 2
      drivers/staging/typec/fusb302/fusb302.c

+ 4 - 2
drivers/staging/typec/fusb302/fusb302.c

@@ -365,13 +365,15 @@ static int fusb302_i2c_block_read(struct fusb302_chip *chip, u8 address,
 	if (ret < 0) {
 	if (ret < 0) {
 		fusb302_log(chip, "cannot block read 0x%02x, len=%d, ret=%d",
 		fusb302_log(chip, "cannot block read 0x%02x, len=%d, ret=%d",
 			    address, length, ret);
 			    address, length, ret);
-		return ret;
+		goto done;
 	}
 	}
 	if (ret != length) {
 	if (ret != length) {
 		fusb302_log(chip, "only read %d/%d bytes from 0x%02x",
 		fusb302_log(chip, "only read %d/%d bytes from 0x%02x",
 			    ret, length, address);
 			    ret, length, address);
-		return -EIO;
+		ret = -EIO;
 	}
 	}
+
+done:
 	atomic_set(&chip->i2c_busy, 0);
 	atomic_set(&chip->i2c_busy, 0);
 
 
 	return ret;
 	return ret;