aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-dev.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 10:00:17 -0500
committerTejun Heo <tj@kernel.org>2010-12-24 10:00:17 -0500
commit9db8995be5e1869b5effa117909bc285e06fc09b (patch)
tree199efc5fdf5f79dbee8532b0aa8e8e8a296bb193 /drivers/rtc/rtc-dev.c
parent0d9ee5b2e9aac981fa063339daf04320eac610d1 (diff)
rtc: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. On removal, directly cancel the work, and flush the uie_task in rtc-dev.c::clear_uie(). Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: rtc-linux@googlegroups.com
Diffstat (limited to 'drivers/rtc/rtc-dev.c')
-rw-r--r--drivers/rtc/rtc-dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 62227cd52410..0cc0984d155b 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -104,7 +104,7 @@ static int clear_uie(struct rtc_device *rtc)
104 } 104 }
105 if (rtc->uie_task_active) { 105 if (rtc->uie_task_active) {
106 spin_unlock_irq(&rtc->irq_lock); 106 spin_unlock_irq(&rtc->irq_lock);
107 flush_scheduled_work(); 107 flush_work_sync(&rtc->uie_task);
108 spin_lock_irq(&rtc->irq_lock); 108 spin_lock_irq(&rtc->irq_lock);
109 } 109 }
110 rtc->uie_irq_active = 0; 110 rtc->uie_irq_active = 0;