Merge tag 'usb-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[firefly-linux-kernel-4.4.55.git] / drivers / base / power / domain_governor.c

diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c
index 85e17bacc834156664c5980c4f7ea7ef68e5d6b6..e60dd12e23aaee75a2a0d90ba0ba720c28c769e7 100644 (file)
--- a/drivers/base/power/domain_governor.c
+++ b/drivers/base/power/domain_governor.c
@@ -77,10 +77,8 @@ static bool default_stop_ok(struct device *dev)
                                      dev_update_qos_constraint);
 
        if (constraint_ns > 0) {
-               constraint_ns -= td->save_state_latency_ns +
-                               td->stop_latency_ns +
-                               td->start_latency_ns +
-                               td->restore_state_latency_ns;
+               constraint_ns -= td->suspend_latency_ns +
+                               td->resume_latency_ns;
                if (constraint_ns == 0)
                        return false;
        }