diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:51:15 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:51:15 -0500 |
commit | 4ab432677957e0a064bba3690004d3244de8ad6c (patch) | |
tree | 4ef5785f20be6f62bfc7fbe4f124e1751c9cabf5 /drivers/hwmon/lm78.c | |
parent | 30765528d156e58d41ed07cae8726c9105111b9d (diff) | |
parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
download | linux-4ab432677957e0a064bba3690004d3244de8ad6c.tar.gz linux-4ab432677957e0a064bba3690004d3244de8ad6c.tar.bz2 linux-4ab432677957e0a064bba3690004d3244de8ad6c.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/hwmon/lm78.c')
-rw-r--r-- | drivers/hwmon/lm78.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index bde0cda9477e..78cdd506439f 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c @@ -451,7 +451,7 @@ static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL); static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf) { struct lm78_data *data = lm78_update_device(dev); - return sprintf(buf, "%d\n", vid_from_reg(82, data->vid)); + return sprintf(buf, "%d\n", vid_from_reg(data->vid, 82)); } static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); |