# HG changeset patch
# User Martin Troxler <ch1010277@ch10lt194>
# Date 1263926027 -3600
# Node ID a93fc03eeb06dd99ccc7e828877b006a29f9b2f6
# Parent  65786b1d30431b41a9f4e8908843dbfa09d1bba5# Parent  a9143f82c7c503f9cef67a6a4ff4f4befdb485ea
Merged

diff -r a9143f82c7c5 -r a93fc03eeb06 master/fsm_slave_scan.c
--- a/master/fsm_slave_scan.c	Tue Jan 19 17:57:46 2010 +0100
+++ b/master/fsm_slave_scan.c	Tue Jan 19 19:33:47 2010 +0100
@@ -770,19 +770,14 @@
     }
 
     if (datagram->working_counter != 1) {
-        fsm->slave->error_flag = 1;
-        fsm->state = ec_fsm_slave_scan_state_error;
-        EC_ERR("Failed to read reg alias of slave %u: ",
-               fsm->slave->ring_position);
-        ec_datagram_print_wc_error(datagram);
-        return;
-    }
-
-    slave->sii.alias = EC_READ_U16(datagram->data);
-    if (slave->master->debug_level)
-         EC_DBG("Alias of slave %u is %u.\n",
-                 slave->ring_position,slave->sii.alias);
-
+        EC_WARN("Failed to read reg alias of slave %u.\n",
+        fsm->slave->ring_position);
+    } else {
+        slave->sii.alias = EC_READ_U16(datagram->data);
+        if (slave->master->debug_level)
+            EC_DBG("Alias of slave %u is %u.\n",
+        slave->ring_position,slave->sii.alias);
+    }
     if (slave->sii.mailbox_protocols & EC_MBOX_COE) {
         ec_fsm_slave_scan_enter_preop(fsm);
     } else {