diff options
Diffstat (limited to 'drivers/hwmon/w83627hf.c')
-rw-r--r-- | drivers/hwmon/w83627hf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c index d7e240635b3b..3ed67a5cd53c 100644 --- a/drivers/hwmon/w83627hf.c +++ b/drivers/hwmon/w83627hf.c | |||
@@ -1181,12 +1181,16 @@ static int w83627hf_detect(struct i2c_adapter *adapter) | |||
1181 | &dev_attr_temp3_type))) | 1181 | &dev_attr_temp3_type))) |
1182 | goto ERROR4; | 1182 | goto ERROR4; |
1183 | 1183 | ||
1184 | if (kind != w83697hf && data->vid != 0xff) | 1184 | if (kind != w83697hf && data->vid != 0xff) { |
1185 | /* Convert VID to voltage based on VRM */ | ||
1186 | data->vrm = vid_which_vrm(); | ||
1187 | |||
1185 | if ((err = device_create_file(&new_client->dev, | 1188 | if ((err = device_create_file(&new_client->dev, |
1186 | &dev_attr_cpu0_vid)) | 1189 | &dev_attr_cpu0_vid)) |
1187 | || (err = device_create_file(&new_client->dev, | 1190 | || (err = device_create_file(&new_client->dev, |
1188 | &dev_attr_vrm))) | 1191 | &dev_attr_vrm))) |
1189 | goto ERROR4; | 1192 | goto ERROR4; |
1193 | } | ||
1190 | 1194 | ||
1191 | if (kind == w83627thf || kind == w83637hf || kind == w83687thf) | 1195 | if (kind == w83627thf || kind == w83637hf || kind == w83687thf) |
1192 | if ((err = device_create_file(&new_client->dev, | 1196 | if ((err = device_create_file(&new_client->dev, |
@@ -1420,9 +1424,6 @@ static void w83627hf_init_client(struct i2c_client *client) | |||
1420 | w83627hf_read_value(client, W83627THF_REG_VRM_OVT_CFG); | 1424 | w83627hf_read_value(client, W83627THF_REG_VRM_OVT_CFG); |
1421 | } | 1425 | } |
1422 | 1426 | ||
1423 | /* Convert VID to voltage based on VRM */ | ||
1424 | data->vrm = vid_which_vrm(); | ||
1425 | |||
1426 | tmp = w83627hf_read_value(client, W83781D_REG_SCFG1); | 1427 | tmp = w83627hf_read_value(client, W83781D_REG_SCFG1); |
1427 | for (i = 1; i <= 3; i++) { | 1428 | for (i = 1; i <= 3; i++) { |
1428 | if (!(tmp & BIT_SCFG1[i - 1])) { | 1429 | if (!(tmp & BIT_SCFG1[i - 1])) { |