diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 16:33:54 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 16:33:54 -0700 |
commit | dd0aa67cd7cf3f4a3ca52ecc1d6b82f3fad1352b (patch) | |
tree | c7cc1c36872fa6e185acd78ec9545ee14b865c17 /drivers/w1/w1.c | |
parent | 526be41625a8b2282d5720dcb19f927edbf193b4 (diff) | |
download | op-kernel-dev-dd0aa67cd7cf3f4a3ca52ecc1d6b82f3fad1352b.zip op-kernel-dev-dd0aa67cd7cf3f4a3ca52ecc1d6b82f3fad1352b.tar.gz |
Revert "w1: introduce a slave mutex for serializing IO"
This reverts commit 59d4467be405316916a4087d5b02d99196eeef04.
Turns out it was the wrong version, will apply the correct version after
this.
Reported-by: NeilBrown <neilb@suse.de>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/w1.c')
-rw-r--r-- | drivers/w1/w1.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 79e488d..bfb8986 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -686,7 +686,6 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn) memcpy(&sl->reg_num, rn, sizeof(sl->reg_num)); atomic_set(&sl->refcnt, 0); init_completion(&sl->released); - mutex_init(&sl->mutex); spin_lock(&w1_flock); f = w1_family_registered(rn->family); |