commit a167d4b5ecf28b2811df74c4f8f7007b5a7b6403
author David Turner <digit@google.com> Tue Mar 31 12:13:12 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 31 12:13:13 2015 +0000
tree e536241f149a26bd84da4bd184c7a1cacf31ee39
parent 103b999f4d42be1bc93576d80e8a36062e408c3a
parent dd3defba2032e3e9c97cd2e95963fc2d98c7ffd7

Merge "goldfish_audio: Fix updating of status bits for output buffers" into studio-1.3-dev

hw/audio/goldfish_audio.c

diff --git a/hw/audio/goldfish_audio.c b/hw/audio/goldfish_audio.c
index 2bd5d83..b25e38a 100644
--- a/hw/audio/goldfish_audio.c
+++ b/hw/audio/goldfish_audio.c
@@ -344,9 +344,10 @@
     *free -= written;
     trace_goldfish_audio_buff_send(written, buf + 1);
 
-    if (!goldfish_audio_buff_length(b) == 0)
-        *new_status |= buf ? AUDIO_INT_WRITE_BUFFER_1_EMPTY :
-                AUDIO_INT_WRITE_BUFFER_2_EMPTY;
+    /* If buffer is drained, set corresponding status bit. */
+    if (!goldfish_audio_buff_length(b))
+        *new_status |= buf ? AUDIO_INT_WRITE_BUFFER_2_EMPTY :
+                AUDIO_INT_WRITE_BUFFER_1_EMPTY;
 
     return true;
 }