--- a/master/fsm_master.c Fri Jun 27 06:56:18 2008 +0000
+++ b/master/fsm_master.c Fri Jun 27 07:22:02 2008 +0000
@@ -242,7 +242,7 @@
if (!(master->slaves = (ec_slave_t *) kmalloc(size, GFP_KERNEL))) {
EC_ERR("Failed to allocate %u bytes of slave memory!\n",
size);
- master->slave_count = 0; // FIXME avoid scanning!
+ master->slave_count = 0; // TODO avoid retrying scan!
master->scan_busy = 0;
wake_up_interruptible(&master->scan_queue);
ec_fsm_master_restart(fsm);
@@ -526,10 +526,6 @@
slave->force_config ? " (forced)" : "");
}
- // configuration will be done immediately; therefore reset the
- // force flag
- slave->force_config = 0;
-
fsm->idle = 0;
fsm->state = ec_fsm_master_state_configure_slave;
ec_fsm_slave_config_start(&fsm->fsm_slave_config, slave);