From 458ca15ab13fd920e1c8aed642a5881723ed2bc8 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Fri, 9 Mar 2007 13:16:12 +0000
Subject: [PATCH] Correctted resetting topology_change_pending and tainted
flags.
---
TODO | 1 -
master/fsm_master.c | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/TODO b/TODO
index 998f1bdc..1538936f 100644
--- a/TODO
+++ b/TODO
@@ -9,7 +9,6 @@ $Id$
* 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 --git a/master/fsm_master.c b/master/fsm_master.c
index 8beacbec..47ebe7aa 100644
--- a/master/fsm_master.c
+++ b/master/fsm_master.c
@@ -209,6 +209,7 @@ void ec_fsm_master_state_broadcast(ec_fsm_master_t *fsm /**< master state machin
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 @@ void ec_fsm_master_state_validate_product(ec_fsm_master_t *fsm /**< master state
// 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
--
GitLab