thermal: da9062/61: Prevent hardware access during system suspend
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 12 Oct 2018 07:20:17 +0000 (09:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2018 19:14:56 +0000 (11:14 -0800)
[ Upstream commit 760eea43f8c6d48684f1f34b8a02fddc1456e849 ]

The workqueue used for monitoring the hardware may run while the device
is already suspended.  Fix this by using the freezable system workqueue
instead, cfr. commit 51e20d0e3a60cf46 ("thermal: Prevent polling from
happening during system suspend").

Fixes: 608567aac3206ae8 ("thermal: da9062/61: Thermal junction temperature monitoring driver")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Steve Twiss <stwiss.opensource@diasemi.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/thermal/da9062-thermal.c

index dd8dd947b7f0737c8a1228c1a7ce89ea915e44d1..01b0cb99445778513b67506a5cd7654909f2988c 100644 (file)
@@ -106,7 +106,7 @@ static void da9062_thermal_poll_on(struct work_struct *work)
                                           THERMAL_EVENT_UNSPECIFIED);
 
                delay = msecs_to_jiffies(thermal->zone->passive_delay);
-               schedule_delayed_work(&thermal->work, delay);
+               queue_delayed_work(system_freezable_wq, &thermal->work, delay);
                return;
        }
 
@@ -125,7 +125,7 @@ static irqreturn_t da9062_thermal_irq_handler(int irq, void *data)
        struct da9062_thermal *thermal = data;
 
        disable_irq_nosync(thermal->irq);
-       schedule_delayed_work(&thermal->work, 0);
+       queue_delayed_work(system_freezable_wq, &thermal->work, 0);
 
        return IRQ_HANDLED;
 }