Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e6f19ab authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "thermal: thermal-core: Change temp type from unsigned to int"

parents a0c45147 19bed646
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr,
{
	struct thermal_zone_device *tz = to_thermal_zone(dev);
	int trip, ret;
	unsigned long temperature;
	long temperature;

	if (!tz->ops->set_trip_temp)
		return -EPERM;
@@ -882,7 +882,7 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr,
	if (!sscanf(attr->attr.name, "trip_point_%d_temp", &trip))
		return -EINVAL;

	if (kstrtoul(buf, 10, &temperature))
	if (kstrtol(buf, 10, &temperature))
		return -EINVAL;

	ret = sensor_set_trip_temp(tz, trip, temperature);