Skip to content

Commit

Permalink
w83l785ts: Fix unchecked return status
Browse files Browse the repository at this point in the history
w83l785ts: Fix unchecked return status

Fix the w83l785ts driver. Add error checking to device_create_file
and also care to destroy the files upon exit.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Rudolf Marek authored and Greg Kroah-Hartman committed Sep 28, 2006
1 parent 311ce2e commit ccc5c30
Showing 1 changed file with 20 additions and 8 deletions.
28 changes: 20 additions & 8 deletions drivers/hwmon/w83l785ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,21 +236,30 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
* Nothing yet, assume it is already started.
*/

err = device_create_file(&new_client->dev,
&sensor_dev_attr_temp1_input.dev_attr);
if (err)
goto exit_remove;

err = device_create_file(&new_client->dev,
&sensor_dev_attr_temp1_max.dev_attr);
if (err)
goto exit_remove;

/* 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 exit_detach;
goto exit_remove;
}

device_create_file(&new_client->dev,
&sensor_dev_attr_temp1_input.dev_attr);
device_create_file(&new_client->dev,
&sensor_dev_attr_temp1_max.dev_attr);

return 0;

exit_detach:
exit_remove:
device_remove_file(&new_client->dev,
&sensor_dev_attr_temp1_input.dev_attr);
device_remove_file(&new_client->dev,
&sensor_dev_attr_temp1_max.dev_attr);
i2c_detach_client(new_client);
exit_free:
kfree(data);
Expand All @@ -264,7 +273,10 @@ static int w83l785ts_detach_client(struct i2c_client *client)
int err;

hwmon_device_unregister(data->class_dev);

device_remove_file(&client->dev,
&sensor_dev_attr_temp1_input.dev_attr);
device_remove_file(&client->dev,
&sensor_dev_attr_temp1_max.dev_attr);
if ((err = i2c_detach_client(client)))
return err;

Expand Down

0 comments on commit ccc5c30

Please sign in to comment.