diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 16:00:17 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 16:00:17 +0100 |
| commit | 9db8995be5e1869b5effa117909bc285e06fc09b (patch) | |
| tree | 199efc5fdf5f79dbee8532b0aa8e8e8a296bb193 /drivers/rtc/rtc-dev.c | |
| parent | 0d9ee5b2e9aac981fa063339daf04320eac610d1 (diff) | |
| download | olio-linux-3.10-9db8995be5e1869b5effa117909bc285e06fc09b.tar.xz olio-linux-3.10-9db8995be5e1869b5effa117909bc285e06fc09b.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index 62227cd5241..0cc0984d155 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) } if (rtc->uie_task_active) { spin_unlock_irq(&rtc->irq_lock); - flush_scheduled_work(); + flush_work_sync(&rtc->uie_task); spin_lock_irq(&rtc->irq_lock); } rtc->uie_irq_active = 0; |