Patched in Tegra support.

1 files changed, 24 insertions, 8 deletions

diff --git a/drivers/hwmon/ltc4261.c b/drivers/hwmon/ltc4261.c
index 84a2d2872b2..4b50601027d 100644
--- a/drivers/hwmon/ltc4261.c
+++ b/drivers/hwmon/ltc4261.c
@@ -33,7 +33,6 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
-#include <linux/jiffies.h>
 
 /* chip registers */
 #define LTC4261_STATUS  0x00    /* readonly */
@@ -86,7 +85,6 @@ static struct ltc4261_data *ltc4261_update_device(struct device *dev)
                                         "Failed to read ADC value: error %d\n",
                                         val);
                                 ret = ERR_PTR(val);
-                                data->valid = 0;
                                 goto abort;
                         }
                         data->regs[i] = val;
@@ -236,9 +234,11 @@ static int ltc4261_probe(struct i2c_client *client,
                 return -ENODEV;
         }
 
-        data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (!data) {
+                ret = -ENOMEM;
+                goto out_kzalloc;
+        }
 
         i2c_set_clientdata(client, data);
         mutex_init(&data->update_lock);
@@ -249,7 +249,7 @@ static int ltc4261_probe(struct i2c_client *client,
         /* Register sysfs hooks */
         ret = sysfs_create_group(&client->dev.kobj, &ltc4261_group);
         if (ret)
-                return ret;
+                goto out_sysfs_create_group;
 
         data->hwmon_dev = hwmon_device_register(&client->dev);
         if (IS_ERR(data->hwmon_dev)) {
@@ -261,6 +261,9 @@ static int ltc4261_probe(struct i2c_client *client,
 
 out_hwmon_device_register:
         sysfs_remove_group(&client->dev.kobj, &ltc4261_group);
+out_sysfs_create_group:
+        kfree(data);
+out_kzalloc:
         return ret;
 }
 
@@ -271,6 +274,8 @@ static int ltc4261_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &ltc4261_group);
 
+        kfree(data);
+
         return 0;
 }
 
@@ -291,8 +296,19 @@ static struct i2c_driver ltc4261_driver = {
         .id_table = ltc4261_id,
 };
 
-module_i2c_driver(ltc4261_driver);
+static int __init ltc4261_init(void)
+{
+        return i2c_add_driver(&ltc4261_driver);
+}
+
+static void __exit ltc4261_exit(void)
+{
+        i2c_del_driver(&ltc4261_driver);
+}
 
-MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
+MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");
 MODULE_DESCRIPTION("LTC4261 driver");
 MODULE_LICENSE("GPL");
+
+module_init(ltc4261_init);
+module_exit(ltc4261_exit);