Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 210773
b: refs/heads/master
c: c3b327d
h: refs/heads/master
i:
  210771: 314da30
v: v3
  • Loading branch information
Guillem Jover authored and Jean Delvare committed Sep 17, 2010
1 parent 06de918 commit a6f4144
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 96f3640894012be7dd15a384566bfdc18297bc6c
refs/heads/master: c3b327d60bbba3f5ff8fd87d1efc0e95eb6c121b
4 changes: 2 additions & 2 deletions trunk/drivers/hwmon/f75375s.c
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)
return -EINVAL;

fanmode = f75375_read8(client, F75375_REG_FAN_TIMER);
fanmode = ~(3 << FAN_CTRL_MODE(nr));
fanmode &= ~(3 << FAN_CTRL_MODE(nr));

switch (val) {
case 0: /* Full speed */
Expand Down Expand Up @@ -350,7 +350,7 @@ static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr,

mutex_lock(&data->update_lock);
conf = f75375_read8(client, F75375_REG_CONFIG1);
conf = ~(1 << FAN_CTRL_LINEAR(nr));
conf &= ~(1 << FAN_CTRL_LINEAR(nr));

if (val == 0)
conf |= (1 << FAN_CTRL_LINEAR(nr)) ;
Expand Down

0 comments on commit a6f4144

Please sign in to comment.