Skip to contentSkip to conversation

w83l785ts: Fix unchecked return status

PATCH New Jean Delvare 1 participant 1 message Sep 24, 2006 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH 19/23 w83l785ts: Fix unchecked return status

From: Rudolf Marek <r.marek at assembler.cz>
Content-Disposition: inline; filename=hwmon-unchecked-return-status-fixes-w83l785ts.patch

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 at assembler.cz>
Signed-off-by Jean Delvare <khali at linux-fr.org>
---
 drivers/hwmon/w83l785ts.c |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/hwmon/w83l785ts.c +20 -8
@@ -236,21 +236,30 @@
 	 * 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);
@@ -264,7 +273,10 @@
 	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;
 
Signature · 1 line
Jean Delvare