Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fb9d78aca709b7a6389c79d6211fb384c69bb79f

Authored by Linus Torvalds
2 parents 5d32c88f0b f283d22713
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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

Showing 1 changed file Side-by-side Diff

drivers/char/apm-emulation.c
Diff comments   View file @ fb9d78a
... ... @@ -301,7 +301,7 @@
301 301 * anything critical, chill a bit on each iteration.
302 302 */
303 303 while (wait_event_freezable(apm_suspend_waitqueue,
304   - as->suspend_state == SUSPEND_DONE))
  304 + as->suspend_state != SUSPEND_ACKED))
305 305 msleep(10);
306 306 break;
307 307 case SUSPEND_ACKTO: