projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
96f3640
)
hwmon: (f75375s) Do not overwrite values read from registers
author
Guillem Jover
<
[email protected]
>
Fri, 17 Sep 2010 15:24:12 +0000
(17:24 +0200)
committer
Jean Delvare
<
[email protected]
>
Fri, 17 Sep 2010 15:24:12 +0000
(17:24 +0200)
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 <
[email protected]
>
Cc: Riku Voipio <
[email protected]
>
Cc:
[email protected]
Signed-off-by: Jean Delvare <
[email protected]
>
drivers/hwmon/f75375s.c
patch
|
blob
|
history
diff --git
a/drivers/hwmon/f75375s.c
b/drivers/hwmon/f75375s.c
index e5828c009d9125105a9c6348e3a93764ad73ff58..9638d58f99fdb0e56f15832f824dc6096d99d3ea 100644
(file)
--- a/
drivers/hwmon/f75375s.c
+++ b/
drivers/hwmon/f75375s.c
@@
-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)) ;