diff options
| author | Guenter Roeck | 2016-07-25 14:53:23 -0700 |
|---|---|---|
| committer | Guenter Roeck | 2016-07-31 15:02:51 -0700 |
| commit | c5fcf01bcfceb245da575cc5bfa4391642649f2d (patch) | |
| tree | 063486384b5e7a77d4b6db06fa9f8e05f85ae85e /drivers/hwmon/lm90.c | |
| parent | be9d6374a76ffbeda783a5bdcb00e219c7bda2d0 (diff) | |
hwmon: (lm90) Improve error handling
Replace devm_add_action() with devm_add_action_or_reset(),
and check its return value.
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/lm90.c')
| -rw-r--r-- | drivers/hwmon/lm90.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index 7b3eedf76c62..fa15f7238a28 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c @@ -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, |