Index: firmware/usbstack/usb_storage.c
===================================================================
--- firmware/usbstack/usb_storage.c	(revision 20321)
+++ firmware/usbstack/usb_storage.c	(working copy)
@@ -339,9 +339,27 @@
 }
 #endif
 
+static void unlock_all(void)
+{
+    int i;
+    for(i=0;i<NUM_VOLUMES;i++) {
+#ifdef TOSHIBA_GIGABEAT_S
+        /* As long as the Gigabeat S is a non-removable device, we need
+           to mark the device as locked to avoid usb_storage_try_release_ata()
+           to leave MSC mode while the device is in use */
+        locked[i] = true;
+#else
+        locked[i] = false;
+#endif
+        ejected[i] = !check_disk_present(IF_MV(i));
+        queue_broadcast(SYS_USB_LUN_LOCKED, (i<<16)+0);
+    }
+}
+
 /* called by usb_core_init() */
 void usb_storage_init(void)
 {
+    unlock_all();
     logf("usb_storage_init done");
 }
 
@@ -420,24 +438,11 @@
 #endif
     usb_drv_recv(ep_out, tb.transfer_buffer, 1024);
 
-    int i;
-    for(i=0;i<NUM_VOLUMES;i++) {
-#ifdef TOSHIBA_GIGABEAT_S
-        /* As long as the Gigabeat S is a non-removable device, we need
-           to mark the device as locked to avoid usb_storage_try_release_ata()
-           to leave MSC mode while the device is in use */
-        locked[i] = true;
-#else
-        locked[i] = false;
-#endif
-        ejected[i] = !check_disk_present(IF_MV(i));
-        queue_broadcast(SYS_USB_LUN_LOCKED, (i<<16)+0);
-    }
 }
 
 void usb_storage_disconnect(void)
 {
-    /* Empty for now */
+    unlock_all();
 }
 
 /* called by usb_core_transfer_complete() */