diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 16:44:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 16:44:34 +1000 |
| commit | 211e08610ff19943089a1bf10567528ebe978857 (patch) | |
| tree | f128d478c36b46df3e4426f5960add3691f5b864 /drivers/w1/w1_int.c | |
| parent | 64acc0549fea1b404b88c1354813886364902488 (diff) | |
| parent | 54bd3b6007788ea806577f480fe2ba2d9f63c5a4 (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 9b084db739c7..3aaa15f6b7e9 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; |