Skip to content

Commit cc8f92e

Browse files
Haoxiang Likrzk
authored andcommitted
w1: fix redundant counter decrement in w1_attach_slave_device()
In w1_attach_slave_device(), if __w1_attach_slave_device() fails, put_device() -> w1_slave_release() is called to do the cleanup job. In w1_slave_release(), sl->family->refcnt and sl->master->slave_count have already been decremented. There is no need to decrement twice in w1_attach_slave_device(). Fixes: 2c927c0 ("w1: Fix slave count on 1-Wire bus (resend)") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn> Link: https://patch.msgid.link/20251218111414.564403-1-lihaoxiang@isrc.iscas.ac.cn Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
1 parent 761fcf4 commit cc8f92e

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

drivers/w1/w1.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -758,8 +758,6 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
758758
if (err < 0) {
759759
dev_err(&dev->dev, "%s: Attaching %s failed.\n", __func__,
760760
sl->name);
761-
dev->slave_count--;
762-
w1_family_put(sl->family);
763761
atomic_dec(&sl->master->refcnt);
764762
kfree(sl);
765763
return err;

0 commit comments

Comments
 (0)