Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149662
b: refs/heads/master
c: 0512a9a
h: refs/heads/master
v: v3
  • Loading branch information
Michel Dänzer authored and Benjamin Herrenschmidt committed Jun 2, 2009
1 parent ecaa64b commit 1653a43
Show file tree
Hide file tree
Showing 2 changed files with 4 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: a85c8e17587e81e1c82f6f341a81e4c778fa65f6
refs/heads/master: 0512a9a8e277a9de2820211eef964473b714ae65
4 changes: 3 additions & 1 deletion trunk/drivers/macintosh/therm_adt746x.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#define CONFIG_REG 0x40
#define MANUAL_MASK 0xe0
#define AUTO_MASK 0x20
#define INVERT_MASK 0x10

static u8 TEMP_REG[3] = {0x26, 0x25, 0x27}; /* local, sensor1, sensor2 */
static u8 LIMIT_REG[3] = {0x6b, 0x6a, 0x6c}; /* local, sensor1, sensor2 */
Expand Down Expand Up @@ -229,7 +230,8 @@ static void write_fan_speed(struct thermostat *th, int speed, int fan)

if (speed >= 0) {
manual = read_reg(th, MANUAL_MODE[fan]);
write_reg(th, MANUAL_MODE[fan], manual|MANUAL_MASK);
write_reg(th, MANUAL_MODE[fan],
(manual|MANUAL_MASK) & (~INVERT_MASK));
write_reg(th, FAN_SPD_SET[fan], speed);
} else {
/* back to automatic */
Expand Down

0 comments on commit 1653a43

Please sign in to comment.