diff options
| author | David Turner <digit@google.com> | 2015-03-31 12:13:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-31 12:13:13 +0000 |
| commit | a167d4b5ecf28b2811df74c4f8f7007b5a7b6403 (patch) | |
| tree | e536241f149a26bd84da4bd184c7a1cacf31ee39 | |
| parent | 103b999f4d42be1bc93576d80e8a36062e408c3a (diff) | |
| parent | dd3defba2032e3e9c97cd2e95963fc2d98c7ffd7 (diff) | |
| download | qemu-android-a167d4b5ecf28b2811df74c4f8f7007b5a7b6403.tar.gz | |
Merge "goldfish_audio: Fix updating of status bits for output buffers" into studio-1.3-dev
| -rw-r--r-- | hw/audio/goldfish_audio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/audio/goldfish_audio.c b/hw/audio/goldfish_audio.c index 2bd5d835a7..b25e38a747 100644 --- a/hw/audio/goldfish_audio.c +++ b/hw/audio/goldfish_audio.c @@ -344,9 +344,10 @@ static bool goldfish_audio_flush(struct goldfish_audio_state *s, int buf, *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; } |