diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-17 12:18:11 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-17 12:18:11 +1000 |
| commit | 5dcff03ebd000234908e9b8b907a01c12e68b2be (patch) | |
| tree | 27d0ad90e965733d0b6f2670df6930d45f72f307 | |
| parent | 3e27ede408845e075a8022f543a7e4d36c9832a3 (diff) | |
| parent | 673681eb310cc28a6be21ef5021c4394e914ceff (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; } |