Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 68735
b: refs/heads/master
c: 894c00c
h: refs/heads/master
i:
  68733: 8617df2
  68731: f477daa
  68727: b105e83
  68719: a83300c
  68703: 0a9d950
  68671: 25292c4
  68607: 55b50b9
v: v3
  • Loading branch information
Jean Delvare authored and Mark M. Hoffman committed Oct 10, 2007
1 parent 964cc6a commit 1eae619
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c2803b98557c10464f3a1fc65f56d0c8c01991bd
refs/heads/master: 894c00cf3805670faddd41d3d5dcb3c0ab75a39d
18 changes: 9 additions & 9 deletions trunk/drivers/hwmon/thmc50.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
Expand Down Expand Up @@ -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 */
Expand All @@ -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:
Expand All @@ -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;
Expand Down

0 comments on commit 1eae619

Please sign in to comment.