diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-12 15:55:50 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-12 15:55:50 +1000 |
| commit | e79ba5580869a26f6713f9550163eaaf560123a1 (patch) | |
| tree | 1daad7d86b5472c4b122fc73ec511f9ff9f0ec11 /drivers | |
| parent | 8881892dc3d9b34bfc4084bea552f38969621f5e (diff) | |
| parent | 07f0773a34229d2cedf446d69ea12e23de9bef8f (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers')
| -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; } |