Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

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

diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index a8fe4c1a8d07a6e099317c8decd85c3275eff3a2..e56d538d039e4220276ea772d9cd6c2ccd95d1d2 100644 (file)
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -64,6 +64,8 @@ enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev, s32 mask)
        struct pm_qos_flags *pqf;
        s32 val;
 
+       lockdep_assert_held(&dev->power.lock);
+
        if (IS_ERR_OR_NULL(qos))
                return PM_QOS_FLAGS_UNDEFINED;
 
@@ -104,6 +106,8 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_flags);
  */
 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);
 }