Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6-omap-h63xx.git] / drivers / w1 / w1_family.c

diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index 3941fb05b8e1631984a0f96ea0093e785c790e61..02eee57d3c0cd2c46e394faf1617251944778e42 100644 (file)
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -27,10 +27,11 @@
 
 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)
 {
-       if (!f->fops->rname || !f->fops->rbin || !f->fops->rval || !f->fops->rvalname)
+       if (!f->fops->rname || !f->fops->rbin)
                return -EINVAL;
 
        return 0;
@@ -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;
 }