1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
--- linux/arch/arm/mach-sa1100/collie_apm.c 2005-06-25 23:37:32.000000000 +0200
+++ linux/arch/arm/mach-sa1100/collie_apm.c 2005-06-27 20:42:00.000000000 +0200
@@ -1228,10 +1228,11 @@
switch (event) {
case APM_SYS_STANDBY:
case APM_USER_STANDBY:
- if (send_event(event)) {
- queue_event(event, NULL);
- if (standbys_pending <= 0)
+ queue_event(event, NULL);
+ if (standbys_pending <= 0) {
+ if (send_event(event)) {
standby();
+ }
}
break;
@@ -1257,10 +1258,10 @@
*/
if (waiting_for_resume)
return;
- if (send_event(event)) {
- queue_event(event, NULL);
- waiting_for_resume = 1;
- if (suspends_pending <= 0)
+ queue_event(event, NULL);
+ waiting_for_resume = 1;
+ if (suspends_pending <= 0)
+ if (send_event(event)) {
(void) suspend();
}
break;
@@ -1468,25 +1469,32 @@
as->standbys_read--;
as->standbys_pending--;
standbys_pending--;
- } else if (!send_event(APM_USER_STANDBY))
- return -EAGAIN;
- else
+ } else {
queue_event(APM_USER_STANDBY, as);
- if (standbys_pending <= 0)
- standby();
+ }
+ if (standbys_pending <= 0) {
+ if (send_event(APM_USER_STANDBY)) {
+ standby();
+ } else {
+ return -EAGAIN;
+ }
+ }
break;
case APM_IOC_SUSPEND:
if (as->suspends_read > 0) {
as->suspends_read--;
as->suspends_pending--;
suspends_pending--;
- } else if (!send_event(APM_USER_SUSPEND))
- return -EAGAIN;
- else
+ } else {
queue_event(APM_USER_SUSPEND, as);
+ }
if (suspends_pending <= 0) {
- if (suspend() != APM_SUCCESS)
- return -EIO;
+ if (send_event(APM_USER_SUSPEND)) {
+ if (suspend() != APM_SUCCESS)
+ return -EIO;
+ } else {
+ return -EAGAIN;
+ }
} else {
as->suspend_wait = 1;
add_wait_queue(&apm_suspend_waitqueue, &wait);
@@ -1637,13 +1645,19 @@
lock_kernel();
if (as->standbys_pending > 0) {
standbys_pending -= as->standbys_pending;
- if (standbys_pending <= 0)
- standby();
+ if (standbys_pending <= 0) {
+ if (send_event(APM_USER_STANDBY)) {
+ standby();
+ }
+ }
}
if (as->suspends_pending > 0) {
suspends_pending -= as->suspends_pending;
- if (suspends_pending <= 0)
- (void) suspend();
+ if (suspends_pending <= 0) {
+ if (send_event(APM_USER_SUSPEND)) {
+ (void) suspend();
+ }
+ }
}
if (user_list == as)
user_list = as->next;
|
