diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-01 16:49:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-01 16:49:13 -0400 |
| commit | 2790aed095fe50b21ab7ed94dc34a0f410a3872c (patch) | |
| tree | 842f28c60c19d52029b71d9b623393b2057b7c34 /drivers/hwmon/lm90.c | |
| parent | f38d2e5313f0af9d9b66c02a5d49c71deb994b85 (diff) | |
| parent | 601807bbb7b422012492611b283bdf3647d3742c (diff) | |
| download | op-kernel-dev-2790aed095fe50b21ab7ed94dc34a0f410a3872c.zip op-kernel-dev-2790aed095fe50b21ab7ed94dc34a0f410a3872c.tar.gz | |
Merge tag 'hwmon-for-linus-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull more hwmon updates from Guenter Roeck:
- Improved error handling in tmp102, lm75, and lm90 drivers
- Bug fixes in sht3x, ftsteutates, iio_hwmon, and adt7411 drivers
* tag 'hwmon-for-linus-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (adt7411) set sane values for CFG1 and CFG3
hwmon: (iio_hwmon) fix memory leak in name attribute
hwmon: (ftsteutates) Fix potential memory access error
hwmon: (tmp102) Improve error handling
hwmon: (lm75) Improve error handling
hwmon: (lm90) Improve error handling
hwmon: (lm90) Add missing assignment
hwmon: (sht3x) set initial jiffies to last_update
Diffstat (limited to 'drivers/hwmon/lm90.c')
| -rw-r--r-- | drivers/hwmon/lm90.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index 1e82374..496e771 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c @@ -529,7 +529,7 @@ static int lm90_update_limits(struct device *dev) return val; data->temp_hyst = val; - lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH); + val = lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH); if (val < 0) return val; data->temp11[REMOTE_LOW] = val << 8; @@ -1551,9 +1551,7 @@ static int lm90_init_client(struct i2c_client *client, struct lm90_data *data) if (config != data->config_orig) /* Only write if changed */ i2c_smbus_write_byte_data(client, LM90_REG_W_CONFIG1, config); - devm_add_action(&client->dev, lm90_restore_conf, data); - - return 0; + return devm_add_action_or_reset(&client->dev, lm90_restore_conf, data); } static bool lm90_is_tripped(struct i2c_client *client, u16 *status) @@ -1640,7 +1638,9 @@ static int lm90_probe(struct i2c_client *client, return err; } - devm_add_action(dev, lm90_regulator_disable, regulator); + err = devm_add_action_or_reset(dev, lm90_regulator_disable, regulator); + if (err) + return err; data = devm_kzalloc(dev, sizeof(struct lm90_data), GFP_KERNEL); if (!data) @@ -1696,7 +1696,9 @@ static int lm90_probe(struct i2c_client *client, err = device_create_file(dev, &dev_attr_pec); if (err) return err; - devm_add_action(dev, lm90_remove_pec, dev); + err = devm_add_action_or_reset(dev, lm90_remove_pec, dev); + if (err) + return err; } hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name, |
