commit 3028ab403f3d8651368efdd596033fb404a9cd84
author David Li <dvdli@google.com> Tue Mar 09 01:54:22 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 09 01:54:22 2021 +0000
tree 0906c962268135832de9fa33d81c5e9cad3cbe32
parent b1192f78b3aaacad4ec499f5667d0778df8f54dc
parent 16d363622cb3bd0c17ce6bc020b4a07d921a5859

Merge "free the pcm structure and return &bad_pcm if open fails."

pcm.c

diff --git a/pcm.c b/pcm.c
index c885b44..1d84dc0 100644
--- a/pcm.c
+++ b/pcm.c
@@ -1062,13 +1062,11 @@
         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)