Patched in Tegra support.

1 files changed, 24 insertions, 8 deletions

diff --git a/drivers/hwmon/ltc4151.c b/drivers/hwmon/ltc4151.c
index 4319a94f549..4ac06b75aa6 100644
--- a/drivers/hwmon/ltc4151.c
+++ b/drivers/hwmon/ltc4151.c
@@ -36,7 +36,6 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
-#include <linux/jiffies.h>
 
 /* chip registers */
 #define LTC4151_SENSE_H 0x00
@@ -155,8 +154,7 @@ static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, \
 static SENSOR_DEVICE_ATTR(curr1_input, S_IRUGO, \
         ltc4151_show_value, NULL, LTC4151_SENSE_H);
 
-/*
- * Finally, construct an array of pointers to members of the above objects,
+/* Finally, construct an array of pointers to members of the above objects,
  * as required for sysfs_create_group()
  */
 static struct attribute *ltc4151_attributes[] = {
@@ -182,9 +180,11 @@ static int ltc4151_probe(struct i2c_client *client,
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 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);
@@ -192,7 +192,7 @@ static int ltc4151_probe(struct i2c_client *client,
         /* Register sysfs hooks */
         ret = sysfs_create_group(&client->dev.kobj, &ltc4151_group);
         if (ret)
-                return ret;
+                goto out_sysfs_create_group;
 
         data->hwmon_dev = hwmon_device_register(&client->dev);
         if (IS_ERR(data->hwmon_dev)) {
@@ -204,6 +204,9 @@ static int ltc4151_probe(struct i2c_client *client,
 
 out_hwmon_device_register:
         sysfs_remove_group(&client->dev.kobj, &ltc4151_group);
+out_sysfs_create_group:
+        kfree(data);
+out_kzalloc:
         return ret;
 }
 
@@ -214,6 +217,8 @@ static int ltc4151_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &ltc4151_group);
 
+        kfree(data);
+
         return 0;
 }
 
@@ -233,8 +238,19 @@ static struct i2c_driver ltc4151_driver = {
         .id_table       = ltc4151_id,
 };
 
-module_i2c_driver(ltc4151_driver);
+static int __init ltc4151_init(void)
+{
+        return i2c_add_driver(&ltc4151_driver);
+}
+
+static void __exit ltc4151_exit(void)
+{
+        i2c_del_driver(&ltc4151_driver);
+}
 
 MODULE_AUTHOR("Per Dalen <per.dalen@appeartv.com>");
 MODULE_DESCRIPTION("LTC4151 driver");
 MODULE_LICENSE("GPL");
+
+module_init(ltc4151_init);
+module_exit(ltc4151_exit);