diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-11 17:51:36 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-11 18:38:20 +0100 |
| commit | c4ffafa51bb0bea648a4ca119033a95057799c9d (patch) | |
| tree | 96b7c6f53672a9c1c802974934df20a6719cb5b3 /drivers/hid/hid-picolcd.c | |
| parent | Merge branch 'master' into upstream (diff) | |
| download | linux-c4ffafa51bb0bea648a4ca119033a95057799c9d.tar.xz linux-c4ffafa51bb0bea648a4ca119033a95057799c9d.zip | |
HID: hid-picolcd: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush picolcd_fb_cleanup on exit instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-picolcd.c')
| -rw-r--r-- | drivers/hid/hid-picolcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c index e4ce47156106..ed0e066b7f07 100644 --- a/drivers/hid/hid-picolcd.c +++ b/drivers/hid/hid-picolcd.c @@ -2750,7 +2750,7 @@ static void __exit picolcd_exit(void) { hid_unregister_driver(&picolcd_driver); #ifdef CONFIG_HID_PICOLCD_FB - flush_scheduled_work(); + flush_work_sync(&picolcd_fb_cleanup); WARN_ON(fb_pending); #endif } |