diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-06-03 21:00:18 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-06-03 21:00:25 +0300 |
| commit | 71cfe07482c26316009fefdcfc833f145d1f1f91 (patch) | |
| tree | 937d7b5351172c7f5f8283b9986a4351cb6aa388 | |
| parent | adfbee2238439cd24ab80454bf2307dbd6ec21f7 (diff) | |
Revert "msm: camera: Remove pointless NULL checks in {__,}msm_remove_session_cmd_ack_q"
* We'll take the upstream fix
This reverts commit 985459a99ce03a22f1ce450f1042c4454a30f3f1.
Change-Id: Ia1f54776dfc167656ade12093bbae9f0abd2895c
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/msm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/camera_v2/msm.c b/drivers/media/platform/msm/camera_v2/msm.c index bf3656f0a4d6..7689aa3dba77 100644 --- a/drivers/media/platform/msm/camera_v2/msm.c +++ b/drivers/media/platform/msm/camera_v2/msm.c @@ -622,6 +622,9 @@ static inline int __msm_remove_session_cmd_ack_q(void *d1, void *d2) { struct msm_command_ack *cmd_ack = d1; + if (!(&cmd_ack->command_q)) + return 0; + msm_queue_drain(&cmd_ack->command_q, struct msm_command, list); return 0; @@ -629,7 +632,7 @@ static inline int __msm_remove_session_cmd_ack_q(void *d1, void *d2) static void msm_remove_session_cmd_ack_q(struct msm_session *session) { - if (!session) + if ((!session) || !(&session->command_ack_q)) return; mutex_lock(&session->lock); |