From f65581d938ded284a60b31e44cc63b22a49e4d45 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Fri, 6 Jun 2008 15:16:37 +0000
Subject: [PATCH] process Sdo requests even with error_flag set.
---
master/fsm_master.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/master/fsm_master.c b/master/fsm_master.c
index cc864686..626a91ac 100644
--- a/master/fsm_master.c
+++ b/master/fsm_master.c
@@ -401,9 +401,8 @@ int ec_fsm_master_action_process_sdo(
up(&master->sdo_sem);
slave = request->slave;
- if (slave->current_state == EC_SLAVE_STATE_INIT ||
- slave->error_flag) {
- EC_ERR("Discarding Sdo request, slave %u not ready.\n",
+ if (slave->current_state == EC_SLAVE_STATE_INIT) {
+ EC_ERR("Discarding Sdo request, slave %u is in INIT.\n",
slave->ring_position);
request->req.state = EC_REQUEST_FAILURE;
wake_up(&master->sdo_queue);
--
GitLab