projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
[linux-2.6-block.git]
/
drivers
/
char
/
apm-emulation.c
diff --git
a/drivers/char/apm-emulation.c
b/drivers/char/apm-emulation.c
index 57501ca9204b017abce7b6a8f160a8e74769544e..46118f8459484a35c3a709c12a28512fd56820af 100644
(file)
--- 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: