Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / macintosh / rack-meter.c

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 53cce3a5da2336b97fd94e0bd55123be2968adbf..39f660b2a60d4516c2e855852b947db72fc6a532 100644 (file)
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -285,8 +285,8 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
 
 static void __devexit rackmeter_stop_cpu_sniffer(struct rackmeter *rm)
 {
-       cancel_rearming_delayed_work(&rm->cpu[0].sniffer);
-       cancel_rearming_delayed_work(&rm->cpu[1].sniffer);
+       cancel_delayed_work_sync(&rm->cpu[0].sniffer);
+       cancel_delayed_work_sync(&rm->cpu[1].sniffer);
 }
 
 static int __devinit rackmeter_setup(struct rackmeter *rm)