--- usbspindownd/usbspindownd.py	2008/01/31 19:06:27	35
+++ usbspindownd/usbspindownd.py	2008/01/31 19:22:32	36
@@ -153,7 +153,7 @@
             debug(options, "Disk eligible for spinning down")
             # We can spin this disk down
             if not config[disk]["spun_down"]:
-              if spin_down(disk):
+              if spin_down(options, disk):
                 debug(options, "Disk spun down")
                 config[disk]["spun_down"] = True
               else:
@@ -164,10 +164,12 @@
             # This disk is ineligible for spinning down at this time
             debug(options, "Disk idle for %s seconds, but not for long enough (%s)" % (now - config[disk]["timestamp"], config[disk]["wait"]))
         else:
-          debug(options, "Disk not idle (old msio: %s, current msio: %s)" % (config[disk]["last_msio"], msio))
           config[disk]["last_msio"] = msio
           config[disk]["timestamp"] = int(time.time())
-          config[disk]["spun_down"] = False
+          if config[disk]["spun_down"]:
+            debug(options, "%s presumed spun back up by activity" % (disk))
+            config[disk]["spun_down"] = False
+          debug(options, "Disk not idle (old msio: %s, current msio: %s)" % (config[disk]["last_msio"], msio))
     debug(options, "Sleeping")
     time.sleep(60)
   debug(options, "Shutting down")