Merge tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / kernel / power / autosleep.c

diff --git a/kernel/power/autosleep.c b/kernel/power/autosleep.c
index ca304046d9e2b60c35c75eac43f5c3efcf2d0d01..c6422ffeda9a9c304a750b9321d555278b6a39d3 100644 (file)
--- a/kernel/power/autosleep.c
+++ b/kernel/power/autosleep.c
@@ -66,7 +66,7 @@ static DECLARE_WORK(suspend_work, try_to_suspend);
 
 void queue_up_suspend_work(void)
 {
-       if (!work_pending(&suspend_work) && autosleep_state > PM_SUSPEND_ON)
+       if (autosleep_state > PM_SUSPEND_ON)
                queue_work(autosleep_wq, &suspend_work);
 }