3 files changed, 7 insertions, 10 deletions

diff --git a/firmware/drivers/wm8731l.c b/firmware/drivers/wm8731l.c
index f73de68b97..71ccfdb4f6 100644
--- a/firmware/drivers/wm8731l.c
+++ b/firmware/drivers/wm8731l.c
@@ -227,7 +227,7 @@ void wmcodec_enable_output(bool enable)
     } else {
 #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB)
         /* We need to disable bit 4 of GPIOL to disable sound on H10 */
-        GPIOL_OUTPUT_VAL ^= 0x10;
+        GPIOL_OUTPUT_VAL &= ~0x10;
 #endif
         wmcodec_mute(1);
     }
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c
index 71eae2105e..6e7b65a803 100644
--- a/firmware/target/arm/iriver/h10/power-h10.c
+++ b/firmware/target/arm/iriver/h10/power-h10.c
@@ -89,11 +89,8 @@ bool ide_powered(void)
 
 void power_off(void)
 {
-    /* set_irq_level(HIGHEST_IRQ_LEVEL);*/
-    #ifndef BOOTLOADER
-    /* We don't turn off the ipod, we put it in a deep sleep */
-    /* pcf50605_standby_mode(); */
-    while(1)
-        yield();
-    #endif
+    /* Give things a second to settle before cutting power */
+    sleep(HZ);
+    
+    GPIOF_OUTPUT_VAL &=~ 0x20;
 }
diff --git a/tools/configure b/tools/configure
index 522b3c7fd0..b98dbdc490 100755
--- a/tools/configure
+++ b/tools/configure
@@ -952,7 +952,7 @@ EOF
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
     boottool="$rootdir/tools/scramble -mi4v3"
-    bootoutput="h10.mi4"
+    bootoutput="H10_20GC.mi4"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset="$genericbitmaptools scramble"
@@ -1004,7 +1004,7 @@ EOF
     plugins="yes"
     codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
     boottool="$rootdir/tools/scramble -mi4v2"
-    bootoutput="h10.mi4"
+    bootoutput="H10.mi4"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
     toolset="$genericbitmaptools scramble"