Re: [PATCH] iio: light: cm3605: Fix an error handling path in cm3605_probe()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun,  7 Aug 2022 08:37:43 +0200
Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> wrote:

> The commit in Fixes also introduced a new error handling path which should
> goto the existing error handling path.
> Otherwise some resources leak.
> 
> Fixes: 0d31d91e6145 ("iio: light: cm3605: Make use of the helper function dev_err_probe()")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
oops. 

Applied to the fixes-togreg branch of iio.git.

I've just move that branch forwards to current char-misc-linus which includes
Greg's pull requests for this cycle via Linus' tree, but may well
rebase on rc1 once that's available.

Thanks,

Jonathan

> ---
>  drivers/iio/light/cm3605.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/light/cm3605.c b/drivers/iio/light/cm3605.c
> index c721b69d5095..0b30db77f78b 100644
> --- a/drivers/iio/light/cm3605.c
> +++ b/drivers/iio/light/cm3605.c
> @@ -226,8 +226,10 @@ static int cm3605_probe(struct platform_device *pdev)
>  	}
>  
>  	irq = platform_get_irq(pdev, 0);
> -	if (irq < 0)
> -		return dev_err_probe(dev, irq, "failed to get irq\n");
> +	if (irq < 0) {
> +		ret = dev_err_probe(dev, irq, "failed to get irq\n");
> +		goto out_disable_aset;
> +	}
>  
>  	ret = devm_request_threaded_irq(dev, irq, cm3605_prox_irq,
>  					NULL, 0, "cm3605", indio_dev);




[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux