Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5052436d authored by Levente Kurusa's avatar Levente Kurusa Committed by Greg Kroah-Hartman
Browse files

drivers/w1/w1_int.c: call put_device if device_register fails 



Currently, memsetting and kfreeing the device is bad behaviour.  The
device will have a reference count of 1 and hence can cause trouble
because it has kfree'd.  Proper way to handle a failed device_register is
to call put_device right after it fails.

Signed-off-by: default avatarLevente Kurusa <levex@linux.com>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c22e645

drivers/w1/w1_int.c

+1 −2
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, 
	err = device_register(&dev->dev);

	if (err) {

		pr_err("Failed to register master device. err=%d\n", err);

		memset(dev, 0, sizeof(struct w1_master));

		kfree(dev);

		put_device(&dev->dev);

		dev = NULL;

	}