summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-05 17:34:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-05 17:34:30 -0700
commitfb9d78aca709b7a6389c79d6211fb384c69bb79f (patch)
treec9895e2b9a2b8ab30b1fbd8b0764a60fdcf3f4ff
parent5d32c88f0b94061b3af2e3ade92422407282eb12 (diff)
parentf283d22713b0bdc147097c92c9b45855339cf1c8 (diff)
downloadlinux-3.10-fb9d78aca709b7a6389c79d6211fb384c69bb79f.tar.gz
linux-3.10-fb9d78aca709b7a6389c79d6211fb384c69bb79f.tar.bz2
linux-3.10-fb9d78aca709b7a6389c79d6211fb384c69bb79f.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
Pull an APM fix from Jiri Kosina: "One deadlock/race fix from Niel that got introduced when we were moving away from freezer_*_count() to wait_event_freezable()." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm: APM: fix deadlock in APM_IOC_SUSPEND ioctl
-rw-r--r--drivers/char/apm-emulation.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index 57501ca9204..46118f84594 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -301,7 +301,7 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg)
* anything critical, chill a bit on each iteration.
*/
while (wait_event_freezable(apm_suspend_waitqueue,
- as->suspend_state == SUSPEND_DONE))
+ as->suspend_state != SUSPEND_ACKED))
msleep(10);
break;
case SUSPEND_ACKTO: