2 files changed, 4 insertions, 3 deletions

diff --git a/firmware/drivers/audio/wm8978.c b/firmware/drivers/audio/wm8978.c
index 31248db545..c50500356a 100644
--- a/firmware/drivers/audio/wm8978.c
+++ b/firmware/drivers/audio/wm8978.c
@@ -223,8 +223,7 @@ void audiohw_postinit(void)
     /* 8. Enable other outputs as required */
 
     /* 9. Set remaining registers */
-    wmc_write(WMC_AUDIO_INTERFACE, WMC_WL_16 | WMC_FMT_I2S
-                                   | WMC_DACLRSWAP | WMC_ADCLRSWAP);
+    wmc_write(WMC_AUDIO_INTERFACE, WMC_WL_16 | WMC_FMT_I2S);
     wmc_write(WMC_DAC_CONTROL, WMC_DACOSR_128 | WMC_AMUTE);
 
     /* Specific to HW clocking */
diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c
index 3820f2ba56..ed3650cd60 100644
--- a/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/pcm-imx31.c
@@ -215,11 +215,13 @@ static void play_start_pcm(void)
     dma_play_data.state = 1;
 
     /* Fill the FIFO or start when data is used up */
+    SSI_SCR1 |= SSI_SCR_SSIEN; /* Enable SSI */
+
     while (1)
     {
         if (SSI_SFCSR_TFCNT0r(SSI_SFCSR1) > 6 || dma_play_data.size == 0)
         {
-            SSI_SCR1 |= (SSI_SCR_TE | SSI_SCR_SSIEN); /* Start transmitting */
+            SSI_SCR1 |= SSI_SCR_TE;  /* Start transmitting */
             return;
         }