1 files changed, 15 insertions, 1 deletions

diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 301ae98bd0ad..4cb33b231124 100644
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -36,6 +36,8 @@
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
 #include <linux/init.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -113,6 +115,7 @@ static struct i2c_driver fscpos_driver = {
  */
 struct fscpos_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* 0 until following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -496,6 +499,12 @@ int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
         dev_info(&new_client->dev, "Found fscpos chip, rev %u\n", data->revision);
 
         /* 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;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_event);
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
@@ -526,6 +535,8 @@ int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -534,14 +545,17 @@ exit:
 
 static int fscpos_detach_client(struct i2c_client *client)
 {
+        struct fscpos_data *data = i2c_get_clientdata(client);
         int err;
 
+        hwmon_device_unregister(data->class_dev);
+
         if ((err = i2c_detach_client(client))) {
                 dev_err(&client->dev, "Client deregistration failed, client"
                                                         " not detached.\n");
                 return err;
         }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }