All of lore.kernel.org
 help / color / mirror / Atom feed
* [lm-sensors] [PATCH 2/2] hwmon: (f75375s) Do not overwrite values
@ 2010-09-03  3:01 ` Guillem Jover
  0 siblings, 0 replies; 4+ messages in thread
From: Guillem Jover @ 2010-09-03  3:01 UTC (permalink / raw)
  To: Riku Voipio; +Cc: lm-sensors, linux-kernel

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>
---
 drivers/hwmon/f75375s.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index e5828c0..9638d58 100644
--- 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)) ;
-- 
1.7.1


_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/2] hwmon: (f75375s) Do not overwrite values read from registers
@ 2010-09-03  3:01 ` Guillem Jover
  0 siblings, 0 replies; 4+ messages in thread
From: Guillem Jover @ 2010-09-03  3:01 UTC (permalink / raw)
  To: Riku Voipio; +Cc: lm-sensors, linux-kernel

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>
---
 drivers/hwmon/f75375s.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index e5828c0..9638d58 100644
--- 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)) ;
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [lm-sensors] [PATCH 2/2] hwmon: (f75375s) Do not overwrite
  2010-09-03  3:01 ` [PATCH 2/2] hwmon: (f75375s) Do not overwrite values read from registers Guillem Jover
@ 2010-09-05 16:47   ` Jean Delvare
  -1 siblings, 0 replies; 4+ messages in thread
From: Jean Delvare @ 2010-09-05 16:47 UTC (permalink / raw)
  To: Guillem Jover; +Cc: Riku Voipio, linux-kernel, lm-sensors

On Fri, 3 Sep 2010 05:01:32 +0200, Guillem Jover wrote:
> 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>
> ---
>  drivers/hwmon/f75375s.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
> index e5828c0..9638d58 100644
> --- 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)) ;

Applied, thanks.

-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [lm-sensors] [PATCH 2/2] hwmon: (f75375s) Do not overwrite values  read from registers
@ 2010-09-05 16:47   ` Jean Delvare
  0 siblings, 0 replies; 4+ messages in thread
From: Jean Delvare @ 2010-09-05 16:47 UTC (permalink / raw)
  To: Guillem Jover; +Cc: Riku Voipio, linux-kernel, lm-sensors

On Fri, 3 Sep 2010 05:01:32 +0200, Guillem Jover wrote:
> 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>
> ---
>  drivers/hwmon/f75375s.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
> index e5828c0..9638d58 100644
> --- 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)) ;

Applied, thanks.

-- 
Jean Delvare

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-05 16:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-03  3:01 [lm-sensors] [PATCH 2/2] hwmon: (f75375s) Do not overwrite values Guillem Jover
2010-09-03  3:01 ` [PATCH 2/2] hwmon: (f75375s) Do not overwrite values read from registers Guillem Jover
2010-09-05 16:47 ` [lm-sensors] [PATCH 2/2] hwmon: (f75375s) Do not overwrite Jean Delvare
2010-09-05 16:47   ` [lm-sensors] [PATCH 2/2] hwmon: (f75375s) Do not overwrite values read from registers Jean Delvare

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.