diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-01-18 15:26:28 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-01-18 15:26:28 +0800 |
| commit | 2ba51c6d36ee1b43c1f898c6c48ddf3d33e9ab30 (patch) | |
| tree | ff3302dc45a91d7bfcaabd37bfa8fa391a954180 /drivers/hwmon/asus_atk0110.c | |
| parent | 28610abf4a574c33ca70e3d7b0e523fdede488d1 (diff) | |
| parent | 90816cc1d4a1d23efe37b74866c6174dd5eab6b5 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.9-rt' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.02-rt
Conflicts:
arch/arm64/mm/init.c
Diffstat (limited to 'drivers/hwmon/asus_atk0110.c')
| -rw-r--r-- | drivers/hwmon/asus_atk0110.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index cccef87963e0..975c43d446f8 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -646,6 +646,9 @@ static int atk_read_value(struct atk_sensor_data *sensor, u64 *value) else err = atk_read_value_new(sensor, value); + if (err) + return err; + sensor->is_valid = true; sensor->last_updated = jiffies; sensor->cached_value = *value; |