Skip to content

Commit

Permalink
hwmon: (f75375s) Do not overwrite values read from registers
Browse files Browse the repository at this point in the history
All bits in the values read from registers to be used for the next
write were getting overwritten, avoid doing so to not mess with the
current configuration.

Signed-off-by: Guillem Jover <guillem@hadrons.org>
Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: stable@kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Guillem Jover authored and Jean Delvare committed Sep 17, 2010
1 parent 96f3640 commit c3b327d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions 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 c3b327d

Please sign in to comment.