Index: firmware/export/config-fuze.h
===================================================================
--- firmware/export/config-fuze.h	(revision 23481)
+++ firmware/export/config-fuze.h	(working copy)
@@ -10,7 +10,7 @@
 #define HW_SAMPR_CAPS       SAMPR_CAP_ALL
 
 /* define this if you have recording possibility */
-//#define HAVE_RECORDING
+#define HAVE_RECORDING
 
 #define REC_SAMPR_CAPS      SAMPR_CAP_ALL
 
Index: firmware/target/arm/as3525/pcm-as3525.c
===================================================================
--- firmware/target/arm/as3525/pcm-as3525.c	(revision 23481)
+++ firmware/target/arm/as3525/pcm-as3525.c	(working copy)
@@ -152,6 +152,8 @@
     cgu_audio &= ~(511 << 2);   /* clear i2sout divider */
     cgu_audio |= divider << 2;  /* set new i2sout divider */
 #ifdef HAVE_RECORDING
+    cgu_audio &= ~(3 << 12);    /* clear i2sin clocksource */
+    cgu_audio |=  (1 << 12);    /* set to PLLA */
     cgu_audio &= ~(511 << 14);  /* clear i2sin divider */
     cgu_audio |= divider << 14; /* set new i2sin divider */
 #endif
@@ -187,22 +189,23 @@
 static int rec_locked = 0;
 static unsigned int *rec_start_addr;
 static size_t      rec_size;
+static unsigned long vic_int_enable;
 
-
 void pcm_rec_lock(void)
 {
-    if(++rec_locked == 1)
-        VIC_INT_EN_CLEAR = INTERRUPT_I2SIN;
+    if(++rec_locked == 1) {
+        vic_int_enable = VIC_INT_ENABLE;
+        VIC_INT_EN_CLEAR = 0;
+    }
 }
 
-
 void pcm_rec_unlock(void)
 {
-    if(--rec_locked == 0)
-        VIC_INT_ENABLE |= INTERRUPT_I2SIN;
+    if(--rec_locked == 0) 
+        VIC_INT_ENABLE = vic_int_enable;
 }
+ 
 
-
 void pcm_record_more(void *start, size_t size)
 {
     rec_start_addr = start;
@@ -212,11 +215,13 @@
 
 void pcm_rec_dma_stop(void)
 {
+    pcm_rec_lock();
     VIC_INT_EN_CLEAR = INTERRUPT_I2SIN;
 
     I2SOUT_CONTROL &= ~(1<<5); /* source = i2soutif fifo */
     CGU_AUDIO &= ~((1<<23)|(1<<11));
     CGU_PERI &= ~(CGU_I2SIN_APB_CLOCK_ENABLE|CGU_I2SOUT_APB_CLOCK_ENABLE);
+    pcm_rec_unlock();
 }
 
 
@@ -227,7 +232,7 @@
 
     status = I2SIN_STATUS;
 
-#if 0   /* FIXME */
+#if 1   /* FIXME */
     if ( status & ((1<<6)|(1<<0)) ) /* errors */
         panicf("i2sin error: 0x%x = %s %s", status,
             (status & (1<<6)) ? "push" : "",