diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-15 11:42:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-15 11:42:13 +1000 |
| commit | f0087f9365eaa345b453f78409e53c6a098329a1 (patch) | |
| tree | 637a282ebf27cde94e72b160aefdaa949980c264 | |
| parent | 129defd156d1ae28d345c034c781c7bcc9f615aa (diff) | |
| parent | f9267303cfdfea35aff30aba6e64b88b1bd93e36 (diff) | |
Merge branch 'akpm/master'
| -rw-r--r-- | drivers/w1/w1_int.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 47249a30eae3..20f766afa4c7 100644 --- a/drivers/w1/w1_int.c +++ b/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; } |