diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-18 13:47:11 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-18 13:47:11 +1000 |
| commit | 805111410c0b111b40ccdc2a7005558e5857bd46 (patch) | |
| tree | 337775068a0092edd4b90b5635c2fb93ef0cfb48 | |
| parent | 06ca355c481de9f28a58cba4a0b94fcfea5c3394 (diff) | |
| parent | cbd4c3fc81755a1bc47352b2ea35ec916df4e7a1 (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; } |