aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Li <dvdli@google.com>2021-03-09 02:19:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-09 02:19:36 +0000
commit935ad161bb89554894400b83f533acaf5c51d17e (patch)
tree0906c962268135832de9fa33d81c5e9cad3cbe32
parentb1192f78b3aaacad4ec499f5667d0778df8f54dc (diff)
parent3028ab403f3d8651368efdd596033fb404a9cd84 (diff)
downloadtinyalsa-935ad161bb89554894400b83f533acaf5c51d17e.tar.gz
Merge "free the pcm structure and return &bad_pcm if open fails." am: 3028ab403fandroid-s-beta-4android-s-beta-3android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/tinyalsa/+/1620694 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f616dc73012170e778c41a22d9d173db5aaf4a8
-rw-r--r--pcm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/pcm.c b/pcm.c
index c885b44..1d84dc0 100644
--- a/pcm.c
+++ b/pcm.c
@@ -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)