--- a/master/master.c	Fri Oct 27 15:07:01 2006 +0000
+++ b/master/master.c	Mon Oct 30 15:39:03 2006 +0000
@@ -433,6 +433,7 @@
 
     // set states for all slaves
     list_for_each_entry(slave, &master->slaves, list) {
+        ec_slave_reset(slave);
         ec_slave_request_state(slave, EC_SLAVE_STATE_PREOP);
 
         fsm->slave = slave;
@@ -452,10 +453,6 @@
     master->release_cb = NULL;
     master->cb_data = NULL;
 
-    list_for_each_entry(slave, &master->slaves, list) {
-        ec_slave_reset(slave);
-    }
-
     master->mode = EC_MASTER_MODE_IDLE;
     queue_delayed_work(master->workqueue, &master->idle_work, 1);
 }