diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-18 13:33:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-18 13:33:15 +1000 |
| commit | 2854a11e7f83dd99c89d2261508c80358cf18183 (patch) | |
| tree | 1c86cc6921357134e188f4a9cac1b65906607352 /drivers/w1/w1_int.c | |
| parent | ad5157a45d59fb08514976209d87dae5ac1bb7e1 (diff) | |
| parent | 522474ad8130cb802912d2d3e72d19fab55b50a0 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/w1/w1_int.c')
| -rw-r--r-- | drivers/w1/w1_int.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 728039d2efe1..ec3fc9335f0d 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -92,9 +92,8 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, err = device_register(&dev->dev); if (err) { printk(KERN_ERR "Failed to register master device. err=%d\n", err); - memset(dev, 0, sizeof(struct w1_master)); - kfree(dev); - dev = NULL; + put_device(&dev->dev); + return NULL; } return dev; |