From: Jean Delvare Date: Sun, 05 Sep 2010 16:47:51 +0000 Subject: Re: [lm-sensors] [PATCH 2/2] hwmon: (f75375s) Do not overwrite Message-Id: <20100905184751.4fe7bc09@hyperion.delvare> List-Id: References: <20100903030132.GA16049@gaara.hadrons.org> In-Reply-To: <20100903030132.GA16049@gaara.hadrons.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Guillem Jover Cc: Riku Voipio , linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org 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 > --- > 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