# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1453464583 -3600
# Node ID 42b62867574ddbf3017a65f86a26704dbc82a194
# Parent  f859d567f94e1a63731863fafc0747b27daf1bc1# Parent  a380cce7d6f0edfd884dff114f8ec5812287a629
merge

diff -r a380cce7d6f0 -r 42b62867574d lib/slave_config.c
--- a/lib/slave_config.c	Tue Apr 14 16:25:44 2015 -0400
+++ b/lib/slave_config.c	Fri Jan 22 13:09:43 2016 +0100
@@ -249,8 +249,9 @@
         if (ret)
             return ret;
 
+        ecrt_slave_config_pdo_assign_clear(sc, sync_info->index);
+
         if (sync_info->n_pdos && sync_info->pdos) {
-            ecrt_slave_config_pdo_assign_clear(sc, sync_info->index);
 
             for (j = 0; j < sync_info->n_pdos; j++) {
                 pdo_info = &sync_info->pdos[j];
diff -r a380cce7d6f0 -r 42b62867574d master/fsm_slave_config.c
--- a/master/fsm_slave_config.c	Tue Apr 14 16:25:44 2015 -0400
+++ b/master/fsm_slave_config.c	Fri Jan 22 13:09:43 2016 +0100
@@ -1129,7 +1129,7 @@
             size = ec_pdo_list_total_size(&sync_config->pdos);
 
             // determine, if PDOs shall be transferred via this SM
-            // inthat case, enable sync manager in every case
+            // in that case, enable sync manager in every case
             for (j = 0; j < sc->used_fmmus; j++) {
                 if (sc->fmmu_configs[j].sync_index == sync_index) {
                     pdo_xfer = 1;
diff -r a380cce7d6f0 -r 42b62867574d master/slave_config.c
--- a/master/slave_config.c	Tue Apr 14 16:25:44 2015 -0400
+++ b/master/slave_config.c	Fri Jan 22 13:09:43 2016 +0100
@@ -779,8 +779,9 @@
         if (ret)
             return ret;
 
+        ecrt_slave_config_pdo_assign_clear(sc, sync_info->index);
+
         if (sync_info->n_pdos && sync_info->pdos) {
-            ecrt_slave_config_pdo_assign_clear(sc, sync_info->index);
 
             for (j = 0; j < sync_info->n_pdos; j++) {
                 pdo_info = &sync_info->pdos[j];