summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@us.ibm.com>2009-03-10 12:55:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-10 15:55:10 -0700
commit8ef1f0291a5d126f678b2f0225843c1ab550559c (patch)
tree68831716d0992a656132dce8ad159755df39d4e3 /drivers/hwmon
parentc15ade65788b70797c947f7de3e049e6a23f407f (diff)
downloadop-kernel-dev-8ef1f0291a5d126f678b2f0225843c1ab550559c.zip
op-kernel-dev-8ef1f0291a5d126f678b2f0225843c1ab550559c.tar.gz
lm85: add VRM10 support for adt7468 chip
The adt7468 chip supports VRM10 sensors just like the adt7463; add a missing check for it. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/lm85.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index cf1422e..b251d86 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -410,7 +410,8 @@ static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr,
struct lm85_data *data = lm85_update_device(dev);
int vid;
- if (data->type == adt7463 && (data->vid & 0x80)) {
+ if ((data->type == adt7463 || data->type == adt7468) &&
+ (data->vid & 0x80)) {
/* 6-pin VID (VRM 10) */
vid = vid_from_reg(data->vid & 0x3f, data->vrm);
} else {
OpenPOWER on IntegriCloud