Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=894c00cf3805670faddd41d3d5dcb3c0ab75a39d
Commit:     894c00cf3805670faddd41d3d5dcb3c0ab75a39d
Parent:     c2803b98557c10464f3a1fc65f56d0c8c01991bd
Author:     Jean Delvare <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 18 18:44:42 2007 +0200
Committer:  Mark M. Hoffman <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:56:31 2007 -0400

    hwmon: (thmc50) Don't create temp3 if not enabled
    
    Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
    Acked-by: Krzysztof Helt <[EMAIL PROTECTED]>
    Signed-off-by: Mark M. Hoffman <[EMAIL PROTECTED]>
---
 drivers/hwmon/thmc50.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c
index f79c750..fb02834 100644
--- a/drivers/hwmon/thmc50.c
+++ b/drivers/hwmon/thmc50.c
@@ -237,7 +237,7 @@ static const struct attribute_group thmc50_group = {
 };
 
 /* for ADM1022 3rd temperature mode */
-static struct attribute *adm1022_attributes[] = {
+static struct attribute *temp3_attributes[] = {
        &sensor_dev_attr_temp3_max.dev_attr.attr,
        &sensor_dev_attr_temp3_min.dev_attr.attr,
        &sensor_dev_attr_temp3_input.dev_attr.attr,
@@ -246,8 +246,8 @@ static struct attribute *adm1022_attributes[] = {
        NULL
 };
 
-static const struct attribute_group adm1022_group = {
-       .attrs = adm1022_attributes,
+static const struct attribute_group temp3_group = {
+       .attrs = temp3_attributes,
 };
 
 static int thmc50_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -345,9 +345,9 @@ static int thmc50_detect(struct i2c_adapter *adapter, int 
address, int kind)
                goto exit_detach;
 
        /* Register ADM1022 sysfs hooks */
-       if (data->type == adm1022)
+       if (data->has_temp3)
                if ((err = sysfs_create_group(&client->dev.kobj,
-                                             &adm1022_group)))
+                                             &temp3_group)))
                        goto exit_remove_sysfs_thmc50;
 
        /* Register a new directory entry with module sensors */
@@ -360,8 +360,8 @@ static int thmc50_detect(struct i2c_adapter *adapter, int 
address, int kind)
        return 0;
 
 exit_remove_sysfs:
-       if (data->type == adm1022)
-               sysfs_remove_group(&client->dev.kobj, &adm1022_group);
+       if (data->has_temp3)
+               sysfs_remove_group(&client->dev.kobj, &temp3_group);
 exit_remove_sysfs_thmc50:
        sysfs_remove_group(&client->dev.kobj, &thmc50_group);
 exit_detach:
@@ -386,8 +386,8 @@ static int thmc50_detach_client(struct i2c_client *client)
 
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &thmc50_group);
-       if (data->type == adm1022)
-               sysfs_remove_group(&client->dev.kobj, &adm1022_group);
+       if (data->has_temp3)
+               sysfs_remove_group(&client->dev.kobj, &temp3_group);
 
        if ((err = i2c_detach_client(client)))
                return err;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to