These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / w1 / w1_int.c

diff --git a/kernel/drivers/w1/w1_int.c b/kernel/drivers/w1/w1_int.c
index 47249a3..20f766a 100644 (file)
--- a/kernel/drivers/w1/w1_int.c
+++ b/kernel/drivers/w1/w1_int.c
@@ -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;
        }