From: Linus Torvalds Date: Fri, 6 Apr 2012 00:34:30 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm X-Git-Tag: daily-2014.03.25.0_l4t/l4t-r19.1~13646 X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=commitdiff_plain;h=fb9d78aca709b7a6389c79d6211fb384c69bb79f;hp=5d32c88f0b94061b3af2e3ade92422407282eb12 Merge branch 'for-linus' of git://git./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 --- 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: