Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[sfrench/cifs-2.6.git] / drivers / hwmon / lm87.c

diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 3ce825489e349c0c106646356397aa87eae69531..988ae1c4aada69ebb2f9315258ac1b4ee878f65b 100644 (file)
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -747,6 +747,7 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
        }
 
        if (!(data->channel & CHAN_NO_VID)) {
+               data->vrm = vid_which_vrm();
                if ((err = device_create_file(&new_client->dev,
                                        &dev_attr_cpu0_vid))
                 || (err = device_create_file(&new_client->dev,
@@ -779,7 +780,6 @@ static void lm87_init_client(struct i2c_client *client)
        u8 config;
 
        data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
-       data->vrm = vid_which_vrm();
 
        config = lm87_read_value(client, LM87_REG_CONFIG);
        if (!(config & 0x01)) {