[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20100905184751.4fe7bc09@hyperion.delvare>
Date: Sun, 5 Sep 2010 18:47:51 +0200
From: Jean Delvare <khali@...ux-fr.org>
To: Guillem Jover <guillem@...rons.org>
Cc: Riku Voipio <riku.voipio@....fi>, linux-kernel@...r.kernel.org,
lm-sensors@...sensors.org
Subject: Re: [lm-sensors] [PATCH 2/2] hwmon: (f75375s) Do not overwrite
values read from registers
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@...rons.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists