diff options
| author | Tejun Heo <tj@kernel.org> | 2010-10-15 18:47:15 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-18 06:12:00 +0200 |
| commit | 790d5c8dac35cf10cf6c52cc9b90ad20603ac2c1 (patch) | |
| tree | fa6e8d0c551eb429b1e77fa3533b9e2aec2ea472 /drivers/input | |
| parent | Input: mousedev - correct lockdep annotation (diff) | |
| download | linux-790d5c8dac35cf10cf6c52cc9b90ad20603ac2c1.tar.xz linux-790d5c8dac35cf10cf6c52cc9b90ad20603ac2c1.zip | |
Input: hp680_ts_input - use cancel_delayed_work_sync()
Make hp680_ts_init/exit() call cancel_delayed_work_sync() instead of
calling cancel_delayed_work() followed by flush_scheduled_work().
This is to prepare for the deprecation and removal of
flush_scheduled_work().
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/hp680_ts_input.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c index a89700e7ace4..498bd62af09a 100644 --- a/drivers/input/touchscreen/hp680_ts_input.c +++ b/drivers/input/touchscreen/hp680_ts_input.c @@ -107,8 +107,7 @@ static int __init hp680_ts_init(void) return 0; fail2: free_irq(HP680_TS_IRQ, NULL); - cancel_delayed_work(&work); - flush_scheduled_work(); + cancel_delayed_work_sync(&work); fail1: input_free_device(hp680_ts_dev); return err; } @@ -116,8 +115,7 @@ static int __init hp680_ts_init(void) static void __exit hp680_ts_exit(void) { free_irq(HP680_TS_IRQ, NULL); - cancel_delayed_work(&work); - flush_scheduled_work(); + cancel_delayed_work_sync(&work); input_unregister_device(hp680_ts_dev); } |