diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 172d3e47070f21b80e15a2bb365a1a92ce5b603f..921c6d2bc8fc6b1959aa932a623469d59112b719 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_sched();  /* Allow sonypi interrupt to complete. */
+	synchronize_irq(sonypi_device.irq);
 	flush_scheduled_work();
 
 	if (useinput) {