Skip to contentSkip to conversation

hwmon: (f75375s) Do not overwrite values read from registers

PATCH Applied Guillem Jover 2 participants 2 messages Sep 3, 2010 – Sep 5, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 hwmon: (f75375s) Do not overwrite values read from registers

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.

---
 drivers/hwmon/f75375s.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/f75375s.c +2 -2
index e5828c0..9638d58 100644
@@ -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 */
@@ -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)) ;
Signature · 7 lines
1.7.1


_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Applied
#1 lore raw
Quoted 23 lines · Guillem Jover

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.

---
 drivers/hwmon/f75375s.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/f75375s.c +1 -1
index e5828c0..9638d58 100644
@@ -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 */

drivers/hwmon/f75375s.c static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr, · line 356

Quoted 8 lines
drivers/hwmon/f75375s.c +1 -1
@@ -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)) ;

Applied, thanks.

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors