diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-05 20:34:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-05 20:34:30 -0400 |
| commit | fb9d78aca709b7a6389c79d6211fb384c69bb79f (patch) | |
| tree | c9895e2b9a2b8ab30b1fbd8b0764a60fdcf3f4ff /drivers/char | |
| parent | 5d32c88f0b94061b3af2e3ade92422407282eb12 (diff) | |
| parent | f283d22713b0bdc147097c92c9b45855339cf1c8 (diff) | |
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
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/apm-emulation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c index 57501ca9204b..46118f845948 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) | |||
| 301 | * anything critical, chill a bit on each iteration. | 301 | * anything critical, chill a bit on each iteration. |
| 302 | */ | 302 | */ |
| 303 | while (wait_event_freezable(apm_suspend_waitqueue, | 303 | while (wait_event_freezable(apm_suspend_waitqueue, |
| 304 | as->suspend_state == SUSPEND_DONE)) | 304 | as->suspend_state != SUSPEND_ACKED)) |
| 305 | msleep(10); | 305 | msleep(10); |
| 306 | break; | 306 | break; |
| 307 | case SUSPEND_ACKTO: | 307 | case SUSPEND_ACKTO: |