hwmon: Fix unchecked return status,
PATCH 38/39 hwmon: Fix unchecked return status,
From: Jean Delvare <khali at linux-fr.org>
hwmon: Fix unchecked return status, SMSC chips
Fix up 2 more hwmon drivers so that they no longer ignore return status from device_create_file().
Signed-off-by Jean Delvare <khali at linux-fr.org>
Signed-off-by Greg Kroah-Hartman <gregkh at suse.de>
--- drivers/hwmon/smsc47m1.c | 78 ++++++++++++++++++----- drivers/hwmon/smsc47m192.c | 150 +++++++++++++++++++++++++------------------- 2 files changed, 145 insertions(+), 83 deletions(-)
drivers/hwmon/smsc47m1.c +60 -18
@@ -35,6 +35,7 @@ #include <linux/hwmon.h>#include <linux/err.h> #include <linux/init.h> #include <linux/mutex.h> +#include <linux/sysfs.h> #include <asm/io.h> /* Address is autodetected, there is no default value */
@@ -347,6 +348,30 @@ fan_present(2); static DEVICE_ATTR(alarms, S_IRUGO, get_alarms, NULL); +/* Almost all sysfs files may or may not be created depending on the chip +setup so we create them individually. It is still convenient to define a +group to remove them all at once. */ +static struct attribute *smsc47m1_attributes[] = { + &dev_attr_fan1_input.attr, + &dev_attr_fan1_min.attr, + &dev_attr_fan1_div.attr, + &dev_attr_fan2_input.attr, + &dev_attr_fan2_min.attr, + &dev_attr_fan2_div.attr, + + &dev_attr_pwm1.attr, + &dev_attr_pwm1_enable.attr, + &dev_attr_pwm2.attr, + &dev_attr_pwm2_enable.attr, + + &dev_attr_alarms.attr, +NULL +}; + +static const struct attribute_group smsc47m1_group = { + .attrs = smsc47m1_attributes, +}; +static int __init smsc47m1_find (unsigned short *addr) {u8 val;
@@ -447,46 +472,62 @@ static int smsc47m1_detect(struct i2c_adsmsc47m1_update_device (&new_client->dev,1 );/* Register sysfs hooks */ - data->class_dev =hwmon_device_register (&new_client->dev); -if (IS_ERR (data->class_dev)) { - err =PTR_ERR (data->class_dev); - goto error_detach; - } -if (fan1) { -device_create_file (&new_client->dev, &dev_attr_fan1_input); -device_create_file (&new_client->dev, &dev_attr_fan1_min); -device_create_file (&new_client->dev, &dev_attr_fan1_div); +if ((err =device_create_file (&new_client->dev, + &dev_attr_fan1_input)) + || (err =device_create_file (&new_client->dev, + &dev_attr_fan1_min)) + || (err =device_create_file (&new_client->dev, + &dev_attr_fan1_div))) + goto error_remove_files; }else dev_dbg (&new_client->dev,"Fan 1 not enabled by hardware, " "skipping\n" );if (fan2) { -device_create_file (&new_client->dev, &dev_attr_fan2_input); -device_create_file (&new_client->dev, &dev_attr_fan2_min); -device_create_file (&new_client->dev, &dev_attr_fan2_div); +if ((err =device_create_file (&new_client->dev, + &dev_attr_fan2_input)) + || (err =device_create_file (&new_client->dev, + &dev_attr_fan2_min)) + || (err =device_create_file (&new_client->dev, + &dev_attr_fan2_div))) + goto error_remove_files; }else dev_dbg (&new_client->dev,"Fan 2 not enabled by hardware, " "skipping\n" );if (pwm1) { -device_create_file (&new_client->dev, &dev_attr_pwm1); -device_create_file (&new_client->dev, &dev_attr_pwm1_enable); +if ((err =device_create_file (&new_client->dev, + &dev_attr_pwm1)) + || (err =device_create_file (&new_client->dev, + &dev_attr_pwm1_enable))) + goto error_remove_files; }else dev_dbg (&new_client->dev,"PWM 1 not enabled by hardware, " "skipping\n" );if (pwm2) { -device_create_file (&new_client->dev, &dev_attr_pwm2); -device_create_file (&new_client->dev, &dev_attr_pwm2_enable); +if ((err =device_create_file (&new_client->dev, + &dev_attr_pwm2)) + || (err =device_create_file (&new_client->dev, + &dev_attr_pwm2_enable))) + goto error_remove_files; }else dev_dbg (&new_client->dev,"PWM 2 not enabled by hardware, " "skipping\n" ); -device_create_file (&new_client->dev, &dev_attr_alarms); +if ((err =device_create_file (&new_client->dev, &dev_attr_alarms))) + goto error_remove_files; + + data->class_dev =hwmon_device_register (&new_client->dev); +if (IS_ERR (data->class_dev)) { + err =PTR_ERR (data->class_dev); + goto error_remove_files; + }return 0 ; -error_detach: +error_remove_files: +sysfs_remove_group (&new_client->dev.kobj, &smsc47m1_group);i2c_detach_client (new_client); error_free:kfree (data);
@@ -501,6 +542,7 @@ static int smsc47m1_detach_client(structint err;hwmon_device_unregister (data->class_dev); +sysfs_remove_group (&client->dev.kobj, &smsc47m1_group);if ((err =i2c_detach_client (client)))return err;
drivers/hwmon/smsc47m192.c +85 -65
183 lines not on this page · raw message
Signature · 1 line
1.4.2.1