diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-12-10 21:21:33 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@arrakis.delvare> | 2006-12-10 21:21:33 +0100 |
| commit | 07125ab2c2641e976bbaf3b89a735ad5a99e25d3 (patch) | |
| tree | 21c463002783fdae90e6b54673de7582710d02a1 /drivers/i2c | |
| parent | 3bacb36db01c7541ffea21d4ff39219e8b211a5c (diff) | |
| download | linux-3.10-07125ab2c2641e976bbaf3b89a735ad5a99e25d3.tar.gz linux-3.10-07125ab2c2641e976bbaf3b89a735ad5a99e25d3.tar.bz2 linux-3.10-07125ab2c2641e976bbaf3b89a735ad5a99e25d3.zip | |
i2c: Refactor a kfree in i2c-dev
Refactor kfree(i2c_dev) into return_i2c_dev(). This saves some
code and makes more sense, as the memory is allocated in
get_free_i2c_dev().
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index 909428af2b7..ac5bd2a7ca9 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -90,6 +90,7 @@ static void return_i2c_dev(struct i2c_dev *i2c_dev) spin_lock(&i2c_dev_list_lock); list_del(&i2c_dev->list); spin_unlock(&i2c_dev_list_lock); + kfree(i2c_dev); } static ssize_t show_adapter_name(struct device *dev, @@ -431,7 +432,6 @@ error_destroy: device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr)); error: return_i2c_dev(i2c_dev); - kfree(i2c_dev); return res; } @@ -446,7 +446,6 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap) device_remove_file(i2c_dev->dev, &dev_attr_name); return_i2c_dev(i2c_dev); device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr)); - kfree(i2c_dev); pr_debug("i2c-dev: adapter [%s] unregistered\n", adap->name); return 0; |