diff --git a/[refs] b/[refs]
index 4f8eebdbead5..66d23efa5a6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcf65cd41c980278f98b6fc0d9da52747e7d058f
+refs/heads/master: 3cb93db6e89bdffeae1f001bd87c9e96f9b634df
diff --git a/trunk/drivers/char/sonypi.c b/trunk/drivers/char/sonypi.c
index 172d3e47070f..921c6d2bc8fc 100644
--- a/trunk/drivers/char/sonypi.c
+++ b/trunk/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) {