hwmon: (lm90) Improve error handling
authorGuenter Roeck <linux@roeck-us.net>
Mon, 25 Jul 2016 21:53:23 +0000 (14:53 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Sun, 31 Jul 2016 22:02:51 +0000 (15:02 -0700)
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>
drivers/hwmon/lm90.c

index 7b3eedf76c627f82c3c0c7ccdc3fa1d6f17bf8a1..fa15f7238a288d4456f67771de2137b888626fe6 100644 (file)
@@ -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,