APM: fix deadlock in APM_IOC_SUSPEND ioctl
authorNeilBrown <neilb@suse.de>
Sun, 1 Apr 2012 10:19:30 +0000 (20:19 +1000)
committerJiri Kosina <jkosina@suse.cz>
Tue, 3 Apr 2012 01:42:36 +0000 (03:42 +0200)
commitf283d22713b0bdc147097c92c9b45855339cf1c8
treefee788fb13479ebe013eae8c9a4b621d6ccd3057
parentb4a133da2eaccb844a7beaef16ffd9c76a0d21d3
APM: fix deadlock in APM_IOC_SUSPEND ioctl

I found the Xorg server on my ARM device stuck in the 'msleep()' loop
in apm_ioctl.

I suspect it had attempted suspend immediately after resuming and lost
a race.
During that msleep(10);, a new suspend cycle must have started and
changed ->suspend_state to SUSPEND_PENDING, so it was never seen to
be SUSPEND_DONE and the loop could never exited.  It would have moved on
to SUSPEND_ACKTO but never been able to reach SUSPEND_DONE.

So change the loop to only run while SUSPEND_ACKED rather than until
SUSPEND_DONE.  This is much safer.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/char/apm-emulation.c