From: Jean Delvare Date: Sun, 10 Dec 2006 20:21:33 +0000 (+0100) Subject: i2c: Refactor a kfree in i2c-dev X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=07125ab2c2641e976bbaf3b89a735ad5a99e25d3;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Cc: Greg Kroah-Hartman --- diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index 909428af2b7e..ac5bd2a7ca99 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;