aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/sonypi.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 15:59:07 +0100
committerTejun Heo <tj@kernel.org>2010-12-24 15:59:07 +0100
commit3514870f06a7907bc46361aebc3daf5ea4e97eeb (patch)
treef1ece815d9e42578086dc7648975674aa59761a2 /drivers/char/sonypi.c
parent42565999d1e0b8a0c5b4a0d475c26cf3d567e85e (diff)
downloadkernel_samsung_smdk4412-3514870f06a7907bc46361aebc3daf5ea4e97eeb.zip
kernel_samsung_smdk4412-3514870f06a7907bc46361aebc3daf5ea4e97eeb.tar.gz
kernel_samsung_smdk4412-3514870f06a7907bc46361aebc3daf5ea4e97eeb.tar.bz2
sonypi: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush sonypi_device.input_work on removal instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Mattia Dongili <malattia@linux.it>
Diffstat (limited to 'drivers/char/sonypi.c')
-rw-r--r--drivers/char/sonypi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 73f66d0..79e36c8 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1434,7 +1434,7 @@ static int __devexit sonypi_remove(struct platform_device *dev)
sonypi_disable();
synchronize_irq(sonypi_device.irq);
- flush_scheduled_work();
+ flush_work_sync(&sonypi_device.input_work);
if (useinput) {
input_unregister_device(sonypi_device.input_key_dev);