diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-06-26 23:20:36 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-06-26 23:20:36 +0200 |
| commit | 7ca6448dbfb398bba36eda3c01bc14b86c3675be (patch) | |
| tree | 82d934ebf07f22a2c64c3b6d82ec24082878b43a /drivers/w1/w1_family.c | |
| parent | f1f67a9874f1a4bba1adff6d694aa52e5f52ff1a (diff) | |
| parent | 7d681b23d6cc14a8c026ea6756242cb522cbbcae (diff) | |
| download | blackbird-op-linux-7ca6448dbfb398bba36eda3c01bc14b86c3675be.tar.gz blackbird-op-linux-7ca6448dbfb398bba36eda3c01bc14b86c3675be.zip | |
Merge with rsync://fileserver/linux
Update to Linus latest
Diffstat (limited to 'drivers/w1/w1_family.c')
| -rw-r--r-- | drivers/w1/w1_family.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c index d1d56eca1061..02eee57d3c0c 100644 --- a/drivers/w1/w1_family.c +++ b/drivers/w1/w1_family.c @@ -1,8 +1,8 @@ /* - * w1_family.c + * w1_family.c * * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru> - * + * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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; } |
