diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-08-18 18:41:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-18 18:41:12 +0200 |
| commit | f594d0b9b34aeb8e3ffa524eaa8a4085afb56d22 (patch) | |
| tree | 7ef81ad042bcfe78dc0f41e05cebfdbc268871c4 /drivers/hwmon/tmp102.c | |
| parent | b3830e8d478cd9fe33e820425ce431c8ef280967 (diff) | |
| parent | 7b0501b1e7cddd32b265178e32d332bdfbb532d4 (diff) | |
Merge branch 'x86/urgent' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/hwmon/tmp102.c')
| -rw-r--r-- | drivers/hwmon/tmp102.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index a942a2574a4d..8479ac5eb853 100644 --- 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; |