X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fchar%2Fsonypi.c;h=79e36c878a4c181d2edc5e8f3e9b6b00b8fb4253;hb=03a4491f5d6835028dbbcf36990599c5c9f6ff55;hp=73f66d03624dfd2b1e51a0aab8c236fc6ec4c7d6;hpb=67cb40560940ba36de22d66f0d5d8efe235c8bb1;p=~andy%2Flinux

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 73f66d03624..79e36c878a4 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);