Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[deliverable/linux.git] / drivers / hwmon / tmp102.c

diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index a942a2574a4d7dfaa4229f61a48d37905db2b5c3..8479ac5eb853590852c808eab05a8764155555b3 100644 (file)
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -227,7 +227,9 @@ static int tmp102_probe(struct i2c_client *client,
 
        tmp102->config_orig = regval;
 
-       devm_add_action(dev, tmp102_restore_config, tmp102);
+       err = devm_add_action_or_reset(dev, tmp102_restore_config, tmp102);
+       if (err)
+               return err;
 
        regval &= ~TMP102_CONFIG_CLEAR;
        regval |= TMP102_CONFIG_SET;