]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 22:09:56 +0000 (15:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 22:09:56 +0000 (15:09 -0700)
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Runtime: Fix typo in status comparison causing warning

drivers/base/power/runtime.c

index 126ca492dd08fe3694f0e78d823bbb8ec6a692b1..02c652be83e72ce09f5c1316cc3c8415a5894556 100644 (file)
@@ -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;