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

Commit d547d44e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 

Pull thermal management updates from Zhang Rui:

 - Fix a use-after-free issue when unregistering a thermal cooling
   device (Dmitry Osipenko)

 - use power_efficient_wq for thermal worker to save more power (Jeson
   Gao)

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: core: using power_efficient_wq for thermal worker
  thermal: core: Fix use-after-free in thermal_cooling_device_destroy_sysfs
parents 519f64bf c2b59d27

drivers/thermal/thermal_core.c

+6 −3
Original line number Diff line number Diff line
@@ -290,10 +290,12 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz, 
					    int delay)

{

	if (delay > 1000)

		mod_delayed_work(system_freezable_wq, &tz->poll_queue,

		mod_delayed_work(system_freezable_power_efficient_wq,

				 &tz->poll_queue,

				 round_jiffies(msecs_to_jiffies(delay)));

	else if (delay)

		mod_delayed_work(system_freezable_wq, &tz->poll_queue,

		mod_delayed_work(system_freezable_power_efficient_wq,

				 &tz->poll_queue,

				 msecs_to_jiffies(delay));

	else

		cancel_delayed_work(&tz->poll_queue);
@@ -1102,8 +1104,9 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev) 
	mutex_unlock(&thermal_list_lock);



	ida_simple_remove(&thermal_cdev_ida, cdev->id);

	device_unregister(&cdev->device);

	device_del(&cdev->device);

	thermal_cooling_device_destroy_sysfs(cdev);

	put_device(&cdev->device);

}

EXPORT_SYMBOL_GPL(thermal_cooling_device_unregister);