diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-12 20:37:38 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-12 20:37:38 +1000 |
| commit | 4fb9c640b9f44cc13ea9e5c70d1d3af9517b7a62 (patch) | |
| tree | 9df00e8d2852dd4b3df1a9fb7df3d9b718b354e5 /drivers/w1/w1_int.c | |
| parent | a68a9c4c1fff8e2bf7779eb95699d32ccdacb036 (diff) | |
| parent | f7303b2387bf4da7915e4905e7f8d0d95a531a7d (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/w1/w1_int.c')
| -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; } |