diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-18 17:22:45 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-18 17:22:45 +0400 |
| commit | 5b1f6d81e4c63ae30d92678cc35081001add7674 (patch) | |
| tree | 8980816357cfe8df56ca9735da73b75c1ed6d235 /drivers/hwmon/emc2103.c | |
| parent | 8397c76a2c209997c7119bede2f26e51d8c786bc (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| download | linux-5b1f6d81e4c63ae30d92678cc35081001add7674.tar.xz | |
Merge 3.5-rc7 into char-misc-next.
This lets us pick up the mei driver changes that we need in order to
handle future merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon/emc2103.c')
| -rw-r--r-- | drivers/hwmon/emc2103.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/hwmon/emc2103.c b/drivers/hwmon/emc2103.c index 9691f664c76e..e7d234b59312 100644 --- a/drivers/hwmon/emc2103.c +++ b/drivers/hwmon/emc2103.c @@ -451,11 +451,15 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da, data->fan_rpm_control = true; break; default: - mutex_unlock(&data->update_lock); - return -EINVAL; + count = -EINVAL; + goto err; } - read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg); + result = read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg); + if (result) { + count = result; + goto err; + } if (data->fan_rpm_control) conf_reg |= 0x80; @@ -463,7 +467,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da, conf_reg &= ~0x80; i2c_smbus_write_byte_data(client, REG_FAN_CONF1, conf_reg); - +err: mutex_unlock(&data->update_lock); return count; } |