diff options
| author |   Rui Miguel Silva <rmfrfs@gmail.com> | 2017-05-12 21:16:14 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-16 14:23:31 +0200 |
| commit | f0d39a179b9cd38c739acfc4f92720a0c79e1d66 (patch) | |
| tree | 0f4e32d88a34a3a0d80540fddd6bd975d5f11b9c /drivers/staging | |
| parent | staging: rtl8723bs: remove re-positioned call to kfree in os_dep/ioctl_cfg80211.c (diff) | |
| download | linux-dev-f0d39a179b9cd38c739acfc4f92720a0c79e1d66.tar.xz linux-dev-f0d39a179b9cd38c739acfc4f92720a0c79e1d66.zip | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/typec/fusb302/fusb302.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/typec/fusb302/fusb302.c b/drivers/staging/typec/fusb302/fusb302.c index 6bd602db11be..7b0b9e51016d 100644 --- a/drivers/staging/typec/fusb302/fusb302.c +++ b/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) { fusb302_log(chip, "cannot block read 0x%02x, len=%d, ret=%d", address, length, ret); - return ret; + goto done; } if (ret != length) { fusb302_log(chip, "only read %d/%d bytes from 0x%02x", ret, length, address); - return -EIO; + ret = -EIO; } + +done: atomic_set(&chip->i2c_busy, 0); return ret; |