lkml.org 
[lkml]   [2012]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] drivers/w1: free the w1_master at w1_free_dev and return a correct return value
Date
the w1_master pointer is allced at the w1_alloc_master and is not freed when called with
w1_remove_master.

when w1_alloc_dev fails the return should be -ENODEV as it does
device_register, and that is the last case where that function
will fail.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
---
drivers/w1/w1_int.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 6828835..a3cf27d 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -100,6 +100,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
static void w1_free_dev(struct w1_master *dev)
{
device_unregister(&dev->dev);
+ kfree(dev);
}

int w1_add_master_device(struct w1_bus_master *master)
@@ -148,7 +149,7 @@ int w1_add_master_device(struct w1_bus_master *master)
&w1_master_driver, &w1_master_device);
if (!dev) {
mutex_unlock(&w1_mlock);
- return -ENOMEM;
+ return -ENODEV;
}

retval = w1_create_master_attributes(dev);
--
1.7.9.5


\
 
 \ /
  Last update: 2012-06-17 19:01    [W:0.137 / U:39.980 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site