Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 132171
b: refs/heads/master
c: 8ef1f02
h: refs/heads/master
i:
  132169: 5ef7c6a
  132167: 4a3abc6
v: v3
  • Loading branch information
Darrick J. Wong authored and Linus Torvalds committed Mar 10, 2009
1 parent 12a0162 commit b035c6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: c15ade65788b70797c947f7de3e049e6a23f407f
refs/heads/master: 8ef1f0291a5d126f678b2f0225843c1ab550559c
3 changes: 2 additions & 1 deletion trunk/drivers/hwmon/lm85.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit b035c6a

Please sign in to comment.