diff options
| author | Len Brown <len.brown@intel.com> | 2007-12-06 16:51:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-12-06 16:51:29 -0500 |
| commit | 921314811be704252ad2caa8dde507d4c421ddc4 (patch) | |
| tree | 14ce6f28294fecbc729ce174f312c8220ffccc53 /drivers | |
| parent | f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce (diff) | |
| parent | cb43c54ca05c01533c45e4d3abfe8f99b7acf624 (diff) | |
Pull apm-freeze-fix into release branch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/apm-emulation.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c index c99e43b837f..17d54315e14 100644 --- a/drivers/char/apm-emulation.c +++ b/drivers/char/apm-emulation.c @@ -295,7 +295,6 @@ static int apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) { struct apm_user *as = filp->private_data; - unsigned long flags; int err = -EINVAL; if (!as->suser || !as->writer) @@ -331,10 +330,16 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) * Wait for the suspend/resume to complete. If there * are pending acknowledges, we wait here for them. */ - flags = current->flags; + freezer_do_not_count(); wait_event(apm_suspend_waitqueue, as->suspend_state == SUSPEND_DONE); + + /* + * Since we are waiting until the suspend is done, the + * try_to_freeze() in freezer_count() will not trigger + */ + freezer_count(); } else { as->suspend_state = SUSPEND_WAIT; mutex_unlock(&state_lock); @@ -362,14 +367,10 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) * Wait for the suspend/resume to complete. If there * are pending acknowledges, we wait here for them. */ - flags = current->flags; - - wait_event_interruptible(apm_suspend_waitqueue, + wait_event_freezable(apm_suspend_waitqueue, as->suspend_state == SUSPEND_DONE); } - current->flags = flags; - mutex_lock(&state_lock); err = as->suspend_result; as->suspend_state = SUSPEND_NONE; |