Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep'

[karo-tx-linux.git] / drivers / base / power / qos.c

diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 271bec73185ee58976df939cc6fcb561dceb7f82..f850daeffba4417ae6b2cc69a0f4aa5bf065987e 100644 (file)
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -103,8 +103,7 @@ s32 __dev_pm_qos_read_value(struct device *dev)
 {
        lockdep_assert_held(&dev->power.lock);
 
-       return IS_ERR_OR_NULL(dev->power.qos) ?
-               0 : pm_qos_read_value(&dev->power.qos->resume_latency);
+       return dev_pm_qos_raw_read_value(dev);
 }
 
 /**