linux-kernel - Re: [PATCH v3 1/2] iio: vcnl4000: Use a single return when getting IIO_CHAN_INFO

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20200206112450.04004361@archlinux>
Date:   Thu, 6 Feb 2020 11:24:50 +0000
From:   Jonathan Cameron <jic23@...nel.org>
To:     Guido Günther <agx@...xcpu.org>
Cc:     Tomas Novotny <tomas@...otny.cz>, Hartmut Knaack <knaack.h@....de>,
        Lars-Peter Clausen <lars@...afoo.de>,
        Peter Meerwald-Stadler <pmeerw@...erw.net>,
        "Angus Ainslie (Purism)" <angus@...ea.ca>,
        Marco Felsch <m.felsch@...gutronix.de>,
        Thomas Gleixner <tglx@...utronix.de>,
        linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3 1/2] iio: vcnl4000: Use a single return when getting
 IIO_CHAN_INFO_RAW

On Mon,  3 Feb 2020 10:17:01 +0100
Guido Günther <agx@...xcpu.org> wrote:

> This will be useful when introducing runtime pm.
> 
> Signed-off-by: Guido Günther <agx@...xcpu.org>
Applied.

Thanks,

Jonathan

> ---
>  drivers/iio/light/vcnl4000.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
> index b0e241aaefb4..8f198383626b 100644
> --- a/drivers/iio/light/vcnl4000.c
> +++ b/drivers/iio/light/vcnl4000.c
> @@ -335,17 +335,18 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev,
>  		switch (chan->type) {
>  		case IIO_LIGHT:
>  			ret = data->chip_spec->measure_light(data, val);
> -			if (ret < 0)
> -				return ret;
> -			return IIO_VAL_INT;
> +			if (!ret)
> +				ret = IIO_VAL_INT;
> +			break;
>  		case IIO_PROXIMITY:
>  			ret = data->chip_spec->measure_proximity(data, val);
> -			if (ret < 0)
> -				return ret;
> -			return IIO_VAL_INT;
> +			if (!ret)
> +				ret = IIO_VAL_INT;
> +			break;
>  		default:
> -			return -EINVAL;
> +			ret = -EINVAL;
>  		}
> +		return ret;
>  	case IIO_CHAN_INFO_SCALE:
>  		if (chan->type != IIO_LIGHT)
>  			return -EINVAL;