Fix to prevent abort during mq_close

diff --git a/framework/src/tinyalsa/tinyalsa.c b/framework/src/tinyalsa/tinyalsa.c
index 6f09ce0..5b07140 100644 (file)
--- a/framework/src/tinyalsa/tinyalsa.c
+++ b/framework/src/tinyalsa/tinyalsa.c
@@ -734,7 +734,6 @@ int pcm_close(struct pcm *pcm)
                }
        }
 #endif
-       mq_close(pcm->mq);                      /* Close the message queue */
        mq_unlink(pcm->mqname);
 
        if (pcm->fd >= 0) {

diff --git a/os/audio/audio.c b/os/audio/audio.c
index 6bf99eb..0bddceb 100644 (file)
--- a/os/audio/audio.c
+++ b/os/audio/audio.c
@@ -579,6 +579,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
        case AUDIOIOC_UNREGISTERMQ: {
                audvdbg("AUDIOIOC_UNREGISTERMQ\n");
+               mq_close(upper->usermq);                        /* Close the message queue */
 
                upper->usermq = NULL;
                ret = OK;