Commit fb9d78ac authored Apr 05, 2012 by Linus Torvalds

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

parents 5d32c88f f283d227

drivers/char/apm-emulation.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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: