From 1eae619c6107f10ac1bc6704badadd7a620fab93 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 18 Sep 2007 18:44:42 +0200
Subject: [PATCH] --- yaml --- r: 68735 b: refs/heads/master c:
 894c00cf3805670faddd41d3d5dcb3c0ab75a39d h: refs/heads/master i:   68733:
 8617df2617050896f7f7038bcc61410845bcbbda   68731:
 f477daa50cfae8147a8fabbf21b8d0c388c7a574   68727:
 b105e8304d9dce282668747dfc9bc13f42ff8c5c   68719:
 a83300cbee3bad5fc338859b1feb22e37d608fed   68703:
 0a9d950b9e53dbc2224e4ebaf4ea0dc7bbf0e491   68671:
 25292c48664d32e5e8193ca2e1de558d8e8134e1   68607:
 55b50b910eceaa64163a1eade6d44ed3fb21e653 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/hwmon/thmc50.c | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7d2860d2b272..4989f0df3877 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2803b98557c10464f3a1fc65f56d0c8c01991bd
+refs/heads/master: 894c00cf3805670faddd41d3d5dcb3c0ab75a39d
diff --git a/trunk/drivers/hwmon/thmc50.c b/trunk/drivers/hwmon/thmc50.c
index f79c7504204e..fb02834897f3 100644
--- a/trunk/drivers/hwmon/thmc50.c
+++ b/trunk/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;