a5xelte: amplifier: Fix deadlock

If pcm_open() fails with -EBUSY, t->cond is never signaled and
tfa_clock_on() stalls the driver in its while (!tfa_dev->writing) loop
where it waits for the signal to be delivered.

Avoid this by always signaling the calling thread.

Change-Id: I4fd81080e77d5f37963714a5d6b4556c387f5a33
(cherry picked from commit 07b6fbed54c84e8e83f4e3f6ceb89fef81038536)

diff --git a/amplifier/tfa.c b/amplifier/tfa.c
index 858c82006724977c9215d3e3e9374b195c707943..b56e1997ad074df28d9ea51af0bf6e2cee639c38 100644 (file)
--- a/amplifier/tfa.c
+++ b/amplifier/tfa.c
@@ -35,6 +35,8 @@ static void * write_dummy_data(void *param) {
     uint8_t *buffer;
     int size;
     struct pcm *pcm;
+    bool signaled = false;
+
     struct pcm_config config = {
         .channels = 2,
         .rate = 48000,
@@ -63,7 +65,6 @@ static void * write_dummy_data(void *param) {
         goto err_close_pcm;
     }
 
-    bool signaled = false;
     do {
         if (pcm_write(pcm, buffer, size)) {
             ALOGE("%s: pcm_write failed", __func__);
@@ -84,6 +85,13 @@ err_free:
 err_close_pcm:
     pcm_close(pcm);
 exit:
+    if (!signaled) {
+        pthread_mutex_lock(&t->mutex);
+        t->writing = true;
+        pthread_cond_signal(&t->cond);
+        pthread_mutex_unlock(&t->mutex);
+    }
+
     return NULL;
 }