Patched in Tegra support.

1 files changed, 39 insertions, 26 deletions

diff --git a/drivers/hwmon/max1668.c b/drivers/hwmon/max1668.c
index 666d9f6263e..20d1b2ddffb 100644
--- a/drivers/hwmon/max1668.c
+++ b/drivers/hwmon/max1668.c
@@ -1,23 +1,23 @@
 /*
- * Copyright (c) 2011 David George <david.george@ska.ac.za>
- *
- * based on adm1021.c
- * some credit to Christoph Scheurer, but largely a rewrite
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+    Copyright (c) 2011 David George <david.george@ska.ac.za>
+
+    based on adm1021.c
+    some credit to Christoph Scheurer, but largely a rewrite
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
 #include <linux/module.h>
 #include <linux/init.h>
@@ -59,7 +59,7 @@ static unsigned short max1668_addr_list[] = {
 #define DEV_ID_MAX1989          0xb
 
 /* read only mode module parameter */
-static bool read_only;
+static int read_only;
 module_param(read_only, bool, 0);
 MODULE_PARM_DESC(read_only, "Don't set any values, read only mode");
 
@@ -335,10 +335,10 @@ static struct attribute *max1668_attribute_unique[] = {
         NULL
 };
 
-static umode_t max1668_attribute_mode(struct kobject *kobj,
+static mode_t max1668_attribute_mode(struct kobject *kobj,
                                      struct attribute *attr, int index)
 {
-        umode_t ret = S_IRUGO;
+        int ret = S_IRUGO;
         if (read_only)
                 return ret;
         if (attr == &sensor_dev_attr_temp1_max.dev_attr.attr ||
@@ -411,8 +411,7 @@ static int max1668_probe(struct i2c_client *client,
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -ENODEV;
 
-        data = devm_kzalloc(&client->dev, sizeof(struct max1668_data),
-                            GFP_KERNEL);
+        data = kzalloc(sizeof(struct max1668_data), GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
@@ -423,7 +422,7 @@ static int max1668_probe(struct i2c_client *client,
         /* Register sysfs hooks */
         err = sysfs_create_group(&client->dev.kobj, &max1668_group_common);
         if (err)
-                return err;
+                goto error_free;
 
         if (data->type == max1668 || data->type == max1989) {
                 err = sysfs_create_group(&client->dev.kobj,
@@ -445,6 +444,8 @@ error_sysrem1:
                 sysfs_remove_group(&client->dev.kobj, &max1668_group_unique);
 error_sysrem0:
         sysfs_remove_group(&client->dev.kobj, &max1668_group_common);
+error_free:
+        kfree(data);
         return err;
 }
 
@@ -458,6 +459,7 @@ static int max1668_remove(struct i2c_client *client)
 
         sysfs_remove_group(&client->dev.kobj, &max1668_group_common);
 
+        kfree(data);
         return 0;
 }
 
@@ -482,8 +484,19 @@ static struct i2c_driver max1668_driver = {
         .address_list = max1668_addr_list,
 };
 
-module_i2c_driver(max1668_driver);
+static int __init sensors_max1668_init(void)
+{
+        return i2c_add_driver(&max1668_driver);
+}
+
+static void __exit sensors_max1668_exit(void)
+{
+        i2c_del_driver(&max1668_driver);
+}
 
 MODULE_AUTHOR("David George <david.george@ska.ac.za>");
 MODULE_DESCRIPTION("MAX1668 remote temperature sensor driver");
 MODULE_LICENSE("GPL");
+
+module_init(sensors_max1668_init)
+module_exit(sensors_max1668_exit)