From khali@linux-fr.org Tue Aug 15 09:30:32 2006 Date: Tue, 15 Aug 2006 18:30:24 +0200 From: Jean Delvare To: Linux I2C Cc: Greg KH Subject: i2c: __must_check fixes, i2c-dev Message-Id: <20060815183024.9b833de3.khali@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 Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/i2c-dev.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) --- gregkh-2.6.orig/drivers/i2c/i2c-dev.c +++ gregkh-2.6/drivers/i2c/i2c-dev.c @@ -407,6 +407,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,21 @@ static int i2cdev_attach_adapter(struct i2c_dev->dev = device_create(i2c_dev_class, &adap->dev, MKDEV(I2C_MAJOR, adap->nr), "i2c-%d", adap->nr); - if (!i2c_dev->dev) + if (!i2c_dev->dev) { + res = -ENODEV; goto error; - device_create_file(i2c_dev->dev, &dev_attr_name); + } + res = device_create_file(i2c_dev->dev, &dev_attr_name); + if (res) + goto error_destroy; return 0; + +error_destroy: + 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 +445,7 @@ static int i2cdev_detach_adapter(struct if (!i2c_dev) return -ENODEV; + 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);