linux-kernel - Re: [v1,1/1] hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <4bfa5c0e-e6c9-b47c-3b22-5ce9786bc0fd@roeck-us.net>
Date:   Sun, 15 Sep 2019 19:57:19 -0700
From:   Guenter Roeck <linux@...ck-us.net>
To:     Amy.Shih@...antech.com.tw, she90122@...il.com
Cc:     oakley.ding@...antech.com.tw, bichan.lu@...antech.com.tw,
        Jean Delvare <jdelvare@...e.com>, linux-hwmon@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [v1,1/1] hwmon: (nct7904) Fix the incorrect value of vsen_mask in
 nct7904_data struct.

On 9/15/19 7:18 PM, Amy.Shih@...antech.com.tw wrote:
> From: "amy.shih" <amy.shih@...antech.com.tw>
> 
> Voltage sensors overlap with external temperature sensors. Detect
> the multi-function of voltage, thermal diode and thermistor from
> register VT_ADC_MD_REG to set value of vsen_mask in nct7904_data
> struct.
> 
> Signed-off-by: amy.shih <amy.shih@...antech.com.tw>
> ---
>   drivers/hwmon/nct7904.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
> index 95b447cfa24c..ad61c3d92411 100644
> --- a/drivers/hwmon/nct7904.c
> +++ b/drivers/hwmon/nct7904.c
> @@ -919,8 +919,11 @@ static int nct7904_probe(struct i2c_client *client,
>   		bit = (1 << i);
>   		if (val == 0)
>   			data->tcpu_mask &= ~bit;
> -		else if (val == 0x1 || val == 0x2)
> +		else if (val == 0x1 || val == 0x2) {
>   			data->temp_mode |= bit;
> +			data->vsen_mask &= ~(0x06 << (i * 2));
> +		} else
> +			data->vsen_mask &= ~(0x06 << (i * 2));

The second instruction is the same for both branches of the if()
statement and can thus be moved outside.

Either case, if {} is needed for one branch of an if statement,
it needs to be used for the other branch(es) as well.

Guenter