aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hwmon/acpi_power_meter.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 9a0821f1c91..5363da5f4d8 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -101,7 +101,7 @@ struct acpi_power_meter_resource {
101 unsigned long sensors_last_updated; 101 unsigned long sensors_last_updated;
102 struct sensor_device_attribute sensors[NUM_SENSORS]; 102 struct sensor_device_attribute sensors[NUM_SENSORS];
103 int num_sensors; 103 int num_sensors;
104 int trip[2]; 104 s64 trip[2];
105 int num_domain_devices; 105 int num_domain_devices;
106 struct acpi_device **domain_devices; 106 struct acpi_device **domain_devices;
107 struct kobject *holders_dir; 107 struct kobject *holders_dir;
@@ -308,8 +308,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
308 return res; 308 return res;
309 309
310 temp = DIV_ROUND_CLOSEST(temp, 1000); 310 temp = DIV_ROUND_CLOSEST(temp, 1000);
311 if (temp > INT_MAX)
312 return -EINVAL;
313 311
314 mutex_lock(&resource->lock); 312 mutex_lock(&resource->lock);
315 resource->trip[attr->index - 7] = temp; 313 resource->trip[attr->index - 7] = temp;