i2c: __must_check fixes, i2c-dev
PATCH 5/30 i2c: __must_check fixes, i2c-dev
From: Jean Delvare <khali at linux-fr.org>
i2c: __must_check fixes (i2c-dev)
Check for error on sysfs file creation.
Check for error on device creation.
Delete sysfs file on device destruction.
I couldn't test this one beyond compilation, as it applies on top of another patch in Greg's tree [1] which breaks all my systems when I apply it (my udev isn't recent enough.) Anyone with bleeding edge udev is welcome to test and report.
[1] http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/i2c/i2c-dev-device.patch
--- drivers/i2c/i2c-dev.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
drivers/i2c/i2c-dev.c +11 -3
@@ -406,6 +406,7 @@ static struct class *i2c_dev_class;static int i2cdev_attach_adapter (struct i2c_adapter *adap) {struct i2c_dev *i2c_dev; +int res; i2c_dev =get_free_i2c_dev (adap);if (IS_ERR (i2c_dev))
@@ -419,14 +420,20 @@ static int i2cdev_attach_adapter(structMKDEV (I2C_MAJOR , adap->nr), &adap->dev,"i2c-%d" , adap->nr); -if (!i2c_dev->class_dev) +if (!i2c_dev->class_dev) { + res = -ENODEV ; goto error; -class_device_create_file (i2c_dev->class_dev, &class_device_attr_name); + } + res =class_device_create_file (i2c_dev->class_dev, &class_device_attr_name); +if (res) + goto error_destroy;return 0 ; +error_destroy: +class_device_destroy (i2c_dev_class,MKDEV (I2C_MAJOR , adap->nr)); error:return_i2c_dev (i2c_dev);kfree (i2c_dev); -return -ENODEV ; +return res; }static int i2cdev_detach_adapter (struct i2c_adapter *adap)
@@ -437,6 +444,7 @@ static int i2cdev_detach_adapter(structif (!i2c_dev)return -ENODEV ; +class_device_remove_file (i2c_dev->class_dev, &class_device_attr_name);return_i2c_dev (i2c_dev);class_device_destroy (i2c_dev_class,MKDEV (I2C_MAJOR , adap->nr));kfree (i2c_dev);
Signature · 1 line
1.4.2.1
PATCH 5/30 i2c: __must_check fixes, i2c-dev
Quoted 8 lines
From: Jean Delvare <khali at linux-fr.org>
i2c:
__must_checkfixes (i2c-dev)Check for error on sysfs file creation.
Check for error on device creation.
Delete sysfs file on device destruction.
Quoted 6 lines
I couldn't test this one beyond compilation, as it applies on top of another patch in Greg's tree [1] which breaks all my systems when I apply it (my udev isn't recent enough.) Anyone with bleeding edge udev is welcome to test and report.
[1] http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/i2c/i2c-dev-device.patch
For completeness, this comment no more applies thanks to a patch reordering.
Quoted 52 lines
Signed-off-by Jean Delvare <khali at linux-fr.org>Signed-off-by Greg Kroah-Hartman <gregkh at suse.de>--- drivers/i2c/i2c-dev.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)drivers/i2c/i2c-dev.c +11
-3@@ -406,6 +406,7 @@ static struct class *i2c_dev_class;static int i2cdev_attach_adapter (struct i2c_adapter *adap) {struct i2c_dev *i2c_dev; +int res; i2c_dev =get_free_i2c_dev (adap);if (IS_ERR (i2c_dev))@@ -419,14 +420,20 @@ static int i2cdev_attach_adapter(structMKDEV (I2C_MAJOR , adap->nr), &adap->dev,"i2c-%d" , adap->nr); -if (!i2c_dev->class_dev) +if (!i2c_dev->class_dev) { + res = -ENODEV ; goto error; -class_device_create_file (i2c_dev->class_dev, &class_device_attr_name); + } + res =class_device_create_file (i2c_dev->class_dev, &class_device_attr_name); +if (res) + goto error_destroy;return 0 ; +error_destroy: +class_device_destroy (i2c_dev_class,MKDEV (I2C_MAJOR , adap->nr)); error:return_i2c_dev (i2c_dev);kfree (i2c_dev); -return -ENODEV ; +return res; }static int i2cdev_detach_adapter (struct i2c_adapter *adap)@@ -437,6 +444,7 @@ static int i2cdev_detach_adapter(structif (!i2c_dev)return -ENODEV ; +class_device_remove_file (i2c_dev->class_dev, &class_device_attr_name);return_i2c_dev (i2c_dev);class_device_destroy (i2c_dev_class,MKDEV (I2C_MAJOR , adap->nr));kfree (i2c_dev);Signature · 1 line
1.4.2.1
Signature · 1 line
Jean Delvare