aboutsummaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorKevin Winchester <kjwinchester@gmail.com>2010-10-29 15:29:55 +0200
committerSrinidhi KASAGAR <srinidhi.kasagar@stericsson.com>2011-01-18 13:13:28 +0100
commit591f8fdb6da42c94fdb39f0a94efefd29b7e200e (patch)
tree2546fe49ce8a6841b575e68de3580be4b6106878 /drivers/base
parent813649a573c6010636bbadb6ba39848c34f2735b (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> ST-Ericsson Linux next: - ST-Ericsson ID: AP317082 ST-Ericsson FOSS-OUT ID: - Change-Id: Icfa83c6fd54b7b3a872428d74e42f5f2172c7b4e Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/12722 Tested-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'drivers/base')
-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 f929b6a050b..f168e4cf783 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)
/* Pending resume requests take precedence over suspends. */
else if ((dev->power.deferred_resume
- && dev->power.status == RPM_SUSPENDING)
+ && dev->power.runtime_status == RPM_SUSPENDING)
|| (dev->power.request_pending
&& dev->power.request == RPM_REQ_RESUME))
retval = -EAGAIN;