commit c6a20d54551712642698a51b519d87e9441ab48c
author qctecmdr <qctecmdr@localhost> Tue Apr 07 07:27:35 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 07 07:27:35 2020 -0700
tree 557ef3de7cf39a27914bf310c8e899da251af9a9
parent 944d87430b364ddeaf1f05d01f6416359718110c
parent fe0a2a560e08932beed6624a01a9b17b488f8c2f

Merge "st-hal: fix st session deadlock issue"

st_session.c

diff --git a/st_session.c b/st_session.c
index 7c0bfba..b39ecb0 100644
--- a/st_session.c
+++ b/st_session.c
@@ -2646,7 +2646,12 @@
         st_ses->hw_session_started = true;
     } else {
         ALOGE("%s:[%d] failed to restart", __func__, st_ses->sm_handle);
-        st_ses->hw_session_started = false;
+        /*
+         * lower layers like gcs/lsm need to handle double stop calls properly
+         * to avoid possible crash, as some of the clean ups are already issued
+         * during fptrs->restart() when it's failed.
+         */
+        stop_hw_session(st_ses, hw_ses, true);
     }
 
     return status;