1 files changed, 17 insertions, 36 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
index 76789a7dbd..7304bdcff3 100644
--- a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c
@@ -104,7 +104,7 @@ static void play_dma_callback(void)
                   PCM_DMAST_ERR_DMA : PCM_DMAST_OK;
     const void *addr;
     size_t size;
-    
+
     if (pcm_play_dma_complete_callback(status, &addr, &size))
     {
         play_start_dma(addr, size);
@@ -114,33 +114,20 @@ static void play_dma_callback(void)
 
 void pcm_play_lock(void)
 {
-    /* Need to prevent DVFS from causing interrupt priority inversion if audio
-     * is locked and a DVFS interrupt fires, blocking reenabling of audio by a 
-     * low-priority mode for at least the duration of the lengthy DVFS routine.
-     * Not really an issue with state changes but lockout when playing.
-     *
-     * Keep direct use of DVFS code away from here though. This could provide
-     * more services in the future anyway. */
-    kernel_audio_locking(true);
     ++dma_play_data.locked;
 }
 
 void pcm_play_unlock(void)
 {
-    if (--dma_play_data.locked == 0)
+    if (--dma_play_data.locked == 0 && dma_play_data.state != 0)
     {
-        if (dma_play_data.state != 0)
-        {
-            int oldstatus = disable_irq_save();
-            int pending = dma_play_data.callback_pending;
-            dma_play_data.callback_pending = 0;
-            restore_irq(oldstatus);
-
-            if (pending != 0)
-                play_dma_callback();
-        }
-
-        kernel_audio_locking(false);
+        int oldstatus = disable_irq_save();
+        int pending = dma_play_data.callback_pending;
+        dma_play_data.callback_pending = 0;
+        restore_irq(oldstatus);
+
+        if (pending != 0)
+            play_dma_callback();
     }
 }
 
@@ -368,26 +355,20 @@ static void rec_dma_callback(void)
 
 void pcm_rec_lock(void)
 {
-    kernel_audio_locking(true);    
     ++dma_rec_data.locked;
 }
 
 void pcm_rec_unlock(void)
 {
-    if (--dma_rec_data.locked == 0)
+    if (--dma_rec_data.locked == 0 && dma_rec_data.state != 0)
     {
-        if (dma_rec_data.state != 0)
-        {
-            int oldstatus = disable_irq_save();
-            int pending = dma_rec_data.callback_pending;
-            dma_rec_data.callback_pending = 0;
-            restore_irq(oldstatus);
-
-            if (pending != 0)
-                rec_dma_callback();
-        }
-
-        kernel_audio_locking(false);
+        int oldstatus = disable_irq_save();
+        int pending = dma_rec_data.callback_pending;
+        dma_rec_data.callback_pending = 0;
+        restore_irq(oldstatus);
+
+        if (pending != 0)
+            rec_dma_callback();
     }
 }