diff -r 5cf6bb14a579 -r c6b1c8fd20f4 master/master.c
--- a/master/master.c	Fri Nov 30 20:25:18 2012 +0100
+++ b/master/master.c	Tue Dec 04 11:54:13 2012 +0100
@@ -565,8 +565,9 @@
     master->thread = NULL;
     EC_MASTER_INFO(master, "Master thread exited.\n");
 
-    if (master->fsm_datagram.state != EC_DATAGRAM_SENT)
+    if (master->fsm_datagram.state != EC_DATAGRAM_SENT) {
         return;
+    }
 
     // wait for FSM datagram
     sleep_jiffies = max(HZ / 100, 1); // 10 ms, at least 1 jiffy
@@ -1386,15 +1387,20 @@
         up(&master->io_sem);
 
         fsm_exec = 0;
+
         // execute master & slave state machines
-        if (down_interruptible(&master->master_sem))
+        if (down_interruptible(&master->master_sem)) {
             break;
+        }
+
         fsm_exec = ec_fsm_master_exec(&master->fsm);
+
         for (slave = master->slaves;
                 slave < master->slaves + master->slave_count;
                 slave++) {
             ec_fsm_slave_exec(&slave->fsm);
         }
+
         up(&master->master_sem);
 
         // queue and send
@@ -1452,21 +1458,27 @@
             ec_master_output_stats(master);
 
             fsm_exec = 0;
+
             // execute master & slave state machines
-            if (down_interruptible(&master->master_sem))
+            if (down_interruptible(&master->master_sem)) {
                 break;
+            }
+
             fsm_exec += ec_fsm_master_exec(&master->fsm);
+
             for (slave = master->slaves;
                     slave < master->slaves + master->slave_count;
                     slave++) {
                 ec_fsm_slave_exec(&slave->fsm);
             }
+
             up(&master->master_sem);
 
             // inject datagrams (let the rt thread queue them, see
             // ecrt_master_send)
-            if (fsm_exec)
+            if (fsm_exec) {
                 master->injection_seq_fsm++;
+            }
         }
 
 #ifdef EC_USE_HRTIMER
@@ -2261,8 +2273,9 @@
     }
 #endif
     if (ec_master_thread_start(master, ec_master_idle_thread,
-                "EtherCAT-IDLE"))
+                "EtherCAT-IDLE")) {
         EC_MASTER_WARN(master, "Failed to restart master thread!\n");
+    }
 
     /* Disallow scanning to get into the same state like after a master
      * request (after ec_master_enter_operation_phase() is called). */