aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKevin Winchester <kjwinchester@gmail.com>2010-10-29 09:29:55 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2010-10-29 09:29:55 -0400
commit78ca7c37efaa541006269aa3d3e560ea7926e245 (patch)
tree1d54636da21626f281864a777ee7607891c436f4 /drivers
parent18cb657ca1bafe635f368346a1676fb04c512edf (diff)
PM / Runtime: Fix typo in status comparison causing warning
GCC version 4.5.1 gives the following warning: drivers/base/power/runtime.c: In function ‘rpm_check_suspend_allowed’: drivers/base/power/runtime.c:146:25: warning: comparison between ‘enum dpm_state’ and ‘enum rpm_status’ which seems to be a typo in that dev->power.runtime_status should be compared instead of dev->power.status. Signed-off-by: Kevin Winchester <kjwinchester@gmail.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/power/runtime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 126ca492dd08..02c652be83e7 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -143,7 +143,7 @@ static int rpm_check_suspend_allowed(struct device *dev)
143 143
144 /* Pending resume requests take precedence over suspends. */ 144 /* Pending resume requests take precedence over suspends. */
145 else if ((dev->power.deferred_resume 145 else if ((dev->power.deferred_resume
146 && dev->power.status == RPM_SUSPENDING) 146 && dev->power.runtime_status == RPM_SUSPENDING)
147 || (dev->power.request_pending 147 || (dev->power.request_pending
148 && dev->power.request == RPM_REQ_RESUME)) 148 && dev->power.request == RPM_REQ_RESUME))
149 retval = -EAGAIN; 149 retval = -EAGAIN;