--- a/master/master.c	Thu Jun 12 11:53:06 2008 +0000
+++ b/master/master.c	Thu Jun 12 13:00:32 2008 +0000
@@ -251,14 +251,14 @@
             slave < master->slaves + master->slave_count;
             slave++) {
         ec_slave_clear(slave);
-        kfree(slave);
-    }
-
-    if (master->slave_count) {
+    }
+
+    if (master->slaves) {
         kfree(master->slaves);
         master->slaves = NULL;
-        master->slave_count = 0;
-    }
+    }
+
+    master->slave_count = 0;
 }
 
 /*****************************************************************************/