iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull apm-freeze-fix into release branch

Browse Source
This commit is contained in:
Len Brown 2007-12-06 16:51:29 -05:00
commit 921314811b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/char/apm-emulation.c
View File

@ -295,7 +295,6 @@ static int
apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
{ {
struct apm_user *as = filp->private_data; struct apm_user *as = filp->private_data;
unsigned long flags;
int err = -EINVAL; int err = -EINVAL;
if (!as->suser || !as->writer) 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 * Wait for the suspend/resume to complete. If there
* are pending acknowledges, we wait here for them. * are pending acknowledges, we wait here for them.
*/ */
flags = current->flags; freezer_do_not_count();
wait_event(apm_suspend_waitqueue, wait_event(apm_suspend_waitqueue,
as->suspend_state == SUSPEND_DONE); 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 { } else {
as->suspend_state = SUSPEND_WAIT; as->suspend_state = SUSPEND_WAIT;
mutex_unlock(&state_lock); 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 * Wait for the suspend/resume to complete. If there
* are pending acknowledges, we wait here for them. * are pending acknowledges, we wait here for them.
*/ */
flags = current->flags; wait_event_freezable(apm_suspend_waitqueue,
wait_event_interruptible(apm_suspend_waitqueue,
as->suspend_state == SUSPEND_DONE); as->suspend_state == SUSPEND_DONE);
} }
current->flags = flags;
mutex_lock(&state_lock); mutex_lock(&state_lock);
err = as->suspend_result; err = as->suspend_result;
as->suspend_state = SUSPEND_NONE; as->suspend_state = SUSPEND_NONE;