summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorMaciej S. Szmigiero <mail@maciej.szmigiero.name>2017-03-12 08:20:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-12 08:20:53 +0000
commit9bd63bea5015e0f088e0524cb01a4ec846a2d01a (patch)
tree7d0157a62802f609155a379e829df1be5fcd3848 /drivers/w1
parent618692bd8a2f729b76084bdc40076fd21fe7fe12 (diff)
parent1df66c45247185f9fb006166e5933539c2121814 (diff)
w1: don't leak refcount on slave attach failure in w1_attach_slave_device()
am: 1df66c4524 Change-Id: I60200dc28a2dd8d0349261225764a64e1991c789
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/w1.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index c9a7ff67d395..39886edfa222 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -763,6 +763,7 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
dev_err(&dev->dev, "%s: Attaching %s failed.\n", __func__,
sl->name);
w1_family_put(sl->family);
+ atomic_dec(&sl->master->refcnt);
kfree(sl);
return err;
}