Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/hwmon-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/hwmon-2.6: (39 commits)
  hwmon: Remove Yuan Mu's address
  hwmon: Fix unchecked return status, SMSC chips
  hwmon: Fix unchecked return status, batch 6
  w83792d: Fix unchecked return status
  w83l785ts: Fix unchecked return status
  w83781d: Fix unchecked return status
  vt8231: Fix unchecked return status
  Fix unchecked return status, batch 5
  hwmon: Fix unchecked return status, batch 4
  hwmon: Fix unchecked return status, batch 3
  hwmon: Fix unchecked return status, batch 2
  w83627ehf: Fix unchecked return status
  pc87360: Check for error on sysfs files creation
  pc87360: Delete sysfs files on device deletion
  pc87360: Move some code around
  hwmon: Fix unchecked return status, batch 1
  vt1211: Document module parameters
  vt1211: Add documentation
  hwmon: New driver for the VIA VT1211
  w83791d: Documentation update
  ...

1 files changed, 20 insertions, 8 deletions

diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 3f2bac125fb1..a3fcace412f0 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -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);
@@ -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;