summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/hwmon/acpi_power_meter.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 44afb07409a4..f05986e4f379 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -437,9 +437,13 @@ static ssize_t show_val(struct device *dev,
ret = update_cap(resource);
if (ret)
return ret;
+ resource->power_alarm = resource->power > resource->cap;
+ val = resource->power_alarm;
+ } else {
+ val = resource->power_alarm ||
+ resource->power > resource->cap;
+ resource->power_alarm = resource->power > resource->cap;
}
- val = resource->power_alarm || resource->power > resource->cap;
- resource->power_alarm = resource->power > resource->cap;
break;
case 7:
case 8: