diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-06-08 11:12:16 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-06-08 11:12:16 -0700 |
| commit | efa9047cd606af6df1aa7561c33687d1383676e3 (patch) | |
| tree | 8a145024c5aef5bed4114c9e2ccf9f6e8d489d91 | |
| parent | 3475945d2045aa0ed1077c0dae87b7372aadb337 (diff) | |
| parent | 053d5e945046821af0e467a4ecdc128aec52b5d6 (diff) | |
Merge "msm: camera: reset atomic variable"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/msm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/camera_v2/msm.c b/drivers/media/platform/msm/camera_v2/msm.c index e16d08681695..66897a7778a9 100644 --- a/drivers/media/platform/msm/camera_v2/msm.c +++ b/drivers/media/platform/msm/camera_v2/msm.c @@ -231,6 +231,8 @@ static inline void msm_pm_qos_add_request(void) static void msm_pm_qos_remove_request(void) { pr_info("%s: remove request", __func__); + if (!atomic_cmpxchg(&qos_add_request_done, 1, 0)) + return; pm_qos_remove_request(&msm_v4l2_pm_qos_request); } |