Merge "drivers: thermal: Avoid race condition in updating the cooling device" (5f28b859) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/thermal/thermal_core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1325,9 +1325,11 @@ thermal_cooling_device_cur_state_store(struct device *dev,
		if ((long)state < 0)
		return -EINVAL;

		mutex_lock(&cdev->lock);
		cdev->sysfs_cur_state_req = state;

		cdev->updated = false;
		mutex_unlock(&cdev->lock);
		thermal_cdev_update(cdev);

		return count;
		@@ -1349,9 +1351,11 @@ thermal_cooling_device_min_state_store(struct device *dev,
		if ((long)state < 0)
		return -EINVAL;

		mutex_lock(&cdev->lock);
		cdev->sysfs_min_state_req = state;

		cdev->updated = false;
		mutex_unlock(&cdev->lock);
		thermal_cdev_update(cdev);

		return count;