]> git.itanic.dy.fi Git - linux-stable/commitdiff
rtc: Replace flush_scheduled_work() with flush_work().
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Fri, 10 Jun 2022 10:48:36 +0000 (19:48 +0900)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 24 Jun 2022 19:24:02 +0000 (21:24 +0200)
Since "struct rtc_device" is per a device struct, I assume that clear_uie()
needs to wait for only one work associated with that device. Therefore,
wait for only that work using flush_work().

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/8d3a0f55-d861-ba93-0d25-b1172eaa8343@I-love.SAKURA.ne.jp
drivers/rtc/dev.c

index 69325aeede1a380eff5031db427b995a4f7424cb..5cf90daf975c163b19ad4986501f3abbdf2e5831 100644 (file)
@@ -96,7 +96,7 @@ static int clear_uie(struct rtc_device *rtc)
                }
                if (rtc->uie_task_active) {
                        spin_unlock_irq(&rtc->irq_lock);
-                       flush_scheduled_work();
+                       flush_work(&rtc->uie_task);
                        spin_lock_irq(&rtc->irq_lock);
                }
                rtc->uie_irq_active = 0;