diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-14 12:02:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-14 12:02:26 +1000 |
| commit | 546e87bf5d1fbbac20099ab64e12ba7bf5cd0808 (patch) | |
| tree | 626d6edabea66f78fe90a44e5f52c62bd4e074ec | |
| parent | 3efacbfd37d3cfa9ec0be4e4bf1602d15dd5fc1c (diff) | |
| parent | 09b0ea9865a4f3b6e347bab45ea59c1391f0d649 (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; } |