diff options
| author | Kevin Winchester <kjwinchester@gmail.com> | 2010-10-29 15:29:55 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2010-10-29 15:29:55 +0200 |
| commit | 78ca7c37efaa541006269aa3d3e560ea7926e245 (patch) | |
| tree | 1d54636da21626f281864a777ee7607891c436f4 | |
| parent | Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-78ca7c37efaa541006269aa3d3e560ea7926e245.tar.xz linux-78ca7c37efaa541006269aa3d3e560ea7926e245.zip | |
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>
| -rw-r--r-- | drivers/base/power/runtime.c | 2 |
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) /* 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; |