commit 80c1e0d800c224d17919f662ab233ef1962d5805
author Quinn Male <qmale@codeaurora.org> Mon Oct 21 15:16:54 2019 -0700
committer Quinn Male <qmale@codeaurora.org> Mon Oct 21 17:23:44 2019 -0700
tree add46bed41d3818d83546fe80b29702de80a44c1
parent c0e5990164369a44a79ced768b815b047f06f0a9

st-hal: Fix deadlock when load/unload merged sm while buffering

There is a deadlock because the load/unload thread can take the
st_ses lock and wait for the callback thread while the callback
thread is waiting for the st_ses lock.

Change-Id: I9828658a9f507e415c33480ea80d67811341488f

st_session.c

diff --git a/st_session.c b/st_session.c
index f54c999..32a6e90 100644
--- a/st_session.c
+++ b/st_session.c
@@ -3972,6 +3972,7 @@
         if (status)
             ALOGE("%s:[%d] stop_session failed %d", __func__, st_ses->sm_handle,
                   status);
+        STATE_TRANSITION(st_ses, loaded_state_fn);
     }
 
     status = hw_ses->fptrs->dereg_sm(hw_ses);
@@ -4060,6 +4061,7 @@
         if (status)
             ALOGE("%s:[%d] stop_session failed %d", __func__,
                 st_ses->sm_handle, status);
+        STATE_TRANSITION(st_ses, loaded_state_fn);
     }
 
     status = hw_ses->fptrs->dereg_sm(hw_ses);