summaryrefslogtreecommitdiff
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 15:59:07 +0100
committerTejun Heo <tj@kernel.org>2010-12-24 15:59:07 +0100
commitd9c612eb6e9ccb8192e6c4d609dbbf178020c672 (patch)
tree6c10992888953d550bbedb169dc40e57806a6c67 /drivers/macintosh
parenta6665944ef83b6a2db8fc5b323c9fca92375a643 (diff)
macintosh/ams: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush ams_info.worker on detach instead. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/ams/ams-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/ams/ams-core.c b/drivers/macintosh/ams/ams-core.c
index 2ad62c339cd..399beb1638d 100644
--- 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);