Merge with /home/shaggy/git/linus-clean/

[powerpc.git] / drivers / w1 / w1_family.c

diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index b8502d9..02eee57 100644 (file)
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -27,6 +27,7 @@
 
 DEFINE_SPINLOCK(w1_flock);
 static LIST_HEAD(w1_families);
+extern void w1_reconnect_slaves(struct w1_family *f);
 
 static int w1_check_family(struct w1_family *f)
 {
@@ -60,9 +61,10 @@ int w1_register_family(struct w1_family *newf)
                newf->need_exit = 0;
                list_add_tail(&newf->family_entry, &w1_families);
        }
-
        spin_unlock(&w1_flock);
 
+       w1_reconnect_slaves(newf);
+
        return ret;
 }