lkml.org 
[lkml]   [2013]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/4] w1: call put_device if device_register fails
Date
Currently, memsetting and kfreeing the device is bad behaviour.
The device will have a reference count of 1 and hence can cause trouble
because it has kfree'd. Proper way to handle a failed device_register
is to call put_device right after it fails.

Signed-off-by: Levente Kurusa <levex@linux.com>
---
drivers/w1/w1_int.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 5a98649..0b9b59e 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -90,9 +90,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;
--
1.8.3.1


\
 
 \ /
  Last update: 2013-12-13 21:01    [W:0.123 / U:0.476 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site