Merge "thermal: Fix deadlock in thermal thermal_zone_device_check" (aebffd7f) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/thermal/thermal_core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ static void thermal_zone_device_set_polling(struct workqueue_struct *queue,
		mod_delayed_work(queue, &tz->poll_queue,
		msecs_to_jiffies(delay));
		else
		cancel_delayed_work_sync(&tz->poll_queue);
		cancel_delayed_work(&tz->poll_queue);
		}

		static void monitor_thermal_zone(struct thermal_zone_device *tz)
		@@ -1438,7 +1438,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)

		mutex_unlock(&thermal_list_lock);

		thermal_zone_device_set_polling(NULL, tz, 0);
		cancel_delayed_work_sync(&tz->poll_queue);

		thermal_set_governor(tz, NULL);