From 04d69c1a4d78e3da02d1b9010f210251d3897aad Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sun, 6 Nov 2011 14:21:38 +0100 Subject: [PATCH] --- yaml --- r: 275025 b: refs/heads/master c: 51e20d0e3a60cf46b52ee1af598a35834919ed27 h: refs/heads/master i: 275023: 773910f5fc16af31b58631092f429820dc467c00 v: v3 --- [refs] | 2 +- trunk/drivers/thermal/thermal_sys.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 493d3a8c5064..0adbd01238e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4505a2015f4c4b2f21137cc3a6b7400b0f3e073e +refs/heads/master: 51e20d0e3a60cf46b52ee1af598a35834919ed27 diff --git a/trunk/drivers/thermal/thermal_sys.c b/trunk/drivers/thermal/thermal_sys.c index 708f8e92771a..dd9a5743fa99 100644 --- a/trunk/drivers/thermal/thermal_sys.c +++ b/trunk/drivers/thermal/thermal_sys.c @@ -678,10 +678,10 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz, return; if (delay > 1000) - schedule_delayed_work(&(tz->poll_queue), + queue_delayed_work(system_freezable_wq, &(tz->poll_queue), round_jiffies(msecs_to_jiffies(delay))); else - schedule_delayed_work(&(tz->poll_queue), + queue_delayed_work(system_freezable_wq, &(tz->poll_queue), msecs_to_jiffies(delay)); }