aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1_family.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/w1/w1_family.c')
-rw-r--r--drivers/w1/w1_family.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index a3c95bd6890a..8c35f9ccb689 100644
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -53,7 +53,8 @@ int w1_register_family(struct w1_family *newf)
53 } 53 }
54 spin_unlock(&w1_flock); 54 spin_unlock(&w1_flock);
55 55
56 w1_reconnect_slaves(newf); 56 /* check default devices against the new set of drivers */
57 w1_reconnect_slaves(newf, 1);
57 58
58 return ret; 59 return ret;
59} 60}
@@ -77,6 +78,9 @@ void w1_unregister_family(struct w1_family *fent)
77 78
78 spin_unlock(&w1_flock); 79 spin_unlock(&w1_flock);
79 80
81 /* deatch devices using this family code */
82 w1_reconnect_slaves(fent, 0);
83
80 while (atomic_read(&fent->refcnt)) { 84 while (atomic_read(&fent->refcnt)) {
81 printk(KERN_INFO "Waiting for family %u to become free: refcnt=%d.\n", 85 printk(KERN_INFO "Waiting for family %u to become free: refcnt=%d.\n",
82 fent->fid, atomic_read(&fent->refcnt)); 86 fent->fid, atomic_read(&fent->refcnt));