# HG changeset patch # User Florian Pose # Date 1173446172 0 # Node ID 3ed80c8ed6169a1a51fe6c325b84e78f8baa9680 # Parent 811952909e112992fa241621cde755dee01ea1c1 Correctted resetting topology_change_pending and tainted flags. diff -r 811952909e11 -r 3ed80c8ed616 TODO --- a/TODO Fri Mar 09 10:32:25 2007 +0000 +++ b/TODO Fri Mar 09 13:16:12 2007 +0000 @@ -9,7 +9,6 @@ * Release 1.3: - Remove addressing scheme "X:Y". - Remove ugly ec_slave_is_coupler(). - - Reset topology_change_pending on successful validation. - Dynamic creation of EoE handlers. * Future features: diff -r 811952909e11 -r 3ed80c8ed616 master/fsm_master.c --- a/master/fsm_master.c Fri Mar 09 10:32:25 2007 +0000 +++ b/master/fsm_master.c Fri Mar 09 13:16:12 2007 +0000 @@ -209,6 +209,7 @@ if (fsm->topology_change_pending && master->mode == EC_MASTER_MODE_IDLE) { fsm->topology_change_pending = 0; + fsm->tainted = 0; ec_master_eoe_stop(master); ec_master_destroy_slaves(master); @@ -621,6 +622,7 @@ // have all states been validated? if (slave->list.next == &fsm->master->slaves) { + fsm->topology_change_pending = 0; fsm->tainted = 0; fsm->slave = list_entry(fsm->master->slaves.next, ec_slave_t, list); // start writing addresses to offline slaves