Index: apps/playback.c
===================================================================
--- apps/playback.c	(revision 20715)
+++ apps/playback.c	(working copy)
@@ -830,17 +830,21 @@
     if (!filebuf)
         return;     /* Audio buffers not yet set up */
 
-#ifdef HAVE_FLASH_STORAGE
-    int seconds = 1;
-#else
+#if (CONFIG_STORAGE & STORAGE_ATA)
     int seconds;
     int spinup = ata_spinup_time();
     if (spinup)
         seconds = (spinup / HZ) + 1;
     else
         seconds = 5;
+#else
+    int seconds = 1;
 #endif
 
+#ifdef HAVE_DISK_STORAGE
+    seconds += buffer_margin;
+#endif
+
     /* bitrate of last track in buffer dictates watermark */
     struct mp3entry* id3 = NULL;
     if (tracks[track_widx].taginfo_ready)