Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2708
b: refs/heads/master
c: 8e8f928
h: refs/heads/master
v: v3
  • Loading branch information
Grant Coady authored and Greg Kroah-Hartman committed Jun 22, 2005
1 parent ea02466 commit 29ce13c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 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: 937df8df907ce63b0f7e19adf6e3cdef1687fac3
refs/heads/master: 8e8f9289cc5b781d583d5aed935abf060207bbd3
7 changes: 5 additions & 2 deletions trunk/drivers/i2c/chips/adm9240.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ struct adm9240_data {
s8 temp_high; /* rw temp1_max */
s8 temp_hyst; /* rw temp1_max_hyst */
u16 alarms; /* ro alarms */
u8 aout; /* rw analog_out */
u8 aout; /* rw aout_output */
u8 vid; /* ro vid */
u8 vrm; /* -- vrm set on startup, no accessor */
};
Expand All @@ -192,7 +192,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \
}
show_temp(temp_high, 1000);
show_temp(temp_hyst, 1000);
show_temp(temp, 500);
show_temp(temp, 500); /* 0.5'C per bit */

#define set_temp(value, reg) \
static ssize_t set_##value(struct device *dev, const char *buf, \
Expand Down Expand Up @@ -630,6 +630,9 @@ static void adm9240_init_client(struct i2c_client *client)

data->vrm = i2c_which_vrm(); /* need this to report vid as mV */

dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10,
data->vrm % 10);

if (conf & 1) { /* measurement cycle running: report state */

dev_info(&client->dev, "status: config 0x%02x mode %u\n",
Expand Down

0 comments on commit 29ce13c

Please sign in to comment.