diff options
| author | David Li <dvdli@google.com> | 2021-03-09 03:46:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-09 03:46:22 +0000 |
| commit | 8abc00660876849c1daaa89fc3f9039ec99931f7 (patch) | |
| tree | 0906c962268135832de9fa33d81c5e9cad3cbe32 | |
| parent | a79b64889f161c44ab46262687807f38d77fbc28 (diff) | |
| parent | a04e937db9dc527d3c4dc0daed3db5404c21c2b2 (diff) | |
| download | tinyalsa-8abc00660876849c1daaa89fc3f9039ec99931f7.tar.gz | |
Merge "free the pcm structure and return &bad_pcm if open fails." am: 3028ab403f am: 935ad161bb am: a04e937db9
Original change: https://android-review.googlesource.com/c/platform/external/tinyalsa/+/1620694
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic6aa586d115dc47a25161498680c7c79dc95fc3b
| -rw-r--r-- | pcm.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1062,13 +1062,11 @@ fail: pcm->ops->munmap(pcm->data, pcm->mmap_buffer, pcm_frames_to_bytes(pcm, pcm->buffer_size)); fail_close: pcm->ops->close(pcm->data); - pcm->data = NULL; - pcm->fd = -1; fail_open: snd_utils_put_dev_node(pcm->snd_node); - pcm->snd_node = NULL; - return pcm; + free(pcm); + return &bad_pcm; } int pcm_is_ready(struct pcm *pcm) |