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

[mv-sheeva.git] / drivers / macintosh / ams / ams-core.c

diff --git a/drivers/macintosh/ams/ams-core.c b/drivers/macintosh/ams/ams-core.c
index 2ad62c339cd2c9cf849dc3a551a8d47548ef2190..399beb1638d1aa9acf009c1c05aeb9cf1bc79af2 100644 (file)
--- a/drivers/macintosh/ams/ams-core.c
+++ b/drivers/macintosh/ams/ams-core.c
@@ -226,7 +226,7 @@ void ams_sensor_detach(void)
         * We do this after ams_info.exit(), because an interrupt might
         * have arrived before disabling them.
         */
-       flush_scheduled_work();
+       flush_work_sync(&ams_info.worker);
 
        /* Remove device */
        of_device_unregister(ams_info.of_dev);