3 files changed, 13 insertions, 8 deletions

diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 3d8eadb639..8c71f0ecce 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -188,15 +188,17 @@ void thread(void)
 #if  CONFIG_CHARGING || defined(HAVE_USB_POWER) 
     unsigned int last_state = 0;
 #endif    
-    long sleep_time;
+    long sleep_time = 5 * HZ;
     
     struct event ev;
 
     buffelements = sizeof(bat)/sizeof(struct batt_info);
 
-    sleep_time = (rb->global_settings->disk_spindown > 1) ?
-        (rb->global_settings->disk_spindown - 1) * HZ : 5 * HZ;
-    
+#ifndef HAVE_FLASH_STORAGE
+    if(rb->global_settings->disk_spindown > 1)
+        sleep_time = (rb->global_settings->disk_spindown - 1) * HZ;
+#endif
+
     do
     {
         if(!in_usb_mode && got_info && 
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index 54c8c6cb63..ad56475ebc 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -2541,7 +2541,7 @@ int show_menu(void) /* return 1 to quit */
             break;
     }
 
-#ifndef SIMULATOR
+#if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE)
     /* change ata spindown time based on slideshow time setting */
     immediate_ata_off = false;
     rb->ata_spindown(rb->global_settings->disk_spindown);
@@ -3325,7 +3325,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     }
 #endif
 
-#ifndef SIMULATOR
+#if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE)
     /* set back ata spindown time in case we changed it */
     rb->ata_spindown(rb->global_settings->disk_spindown);
 #endif
diff --git a/apps/plugins/video.c b/apps/plugins/video.c
index b56a9d0612..aca960f56e 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -650,8 +650,11 @@ int PlayTick(int fd)
                              * gFileHdr.bps_peak / 8 / HZ;
         }
 
-        if (!gPlay.bRefilling 
-            && rb->global_settings->disk_spindown < 20) /* condition for test only */
+        if (!gPlay.bRefilling
+#ifndef HAVE_FLASH_STORAGE
+            && rb->global_settings->disk_spindown < 20  /* condition for test only */
+#endif
+            )
         {
             rb->ata_sleep(); /* no point in leaving the disk run til timeout */
             gPlay.bDiskSleep = true;