[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <2a333cd4-6ec3-4d80-9d80-ba2add234da8@linux.intel.com>
Date: Mon, 10 Mar 2025 08:49:07 +0100
From: Amadeusz Sławiński
<amadeuszx.slawinski@...ux.intel.com>
To: Christophe JAILLET <christophe.jaillet@...adoo.fr>,
Liam Girdwood <lgirdwood@...il.com>, Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.com>,
Dimitris Papastamos <dp@...nsource.wolfsonmicro.com>,
Charles Keepax <ckeepax@...nsource.wolfsonmicro.com>
Cc: linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
patches@...nsource.cirrus.com, linux-sound@...r.kernel.org
Subject: Re: [PATCH] ASoC: codecs: wm0010: Fix error handling path in
wm0010_spi_probe()
On 3/9/2025 8:50 PM, Christophe JAILLET wrote:
> Free some resources in the error handling path of the probe, as already
> done in the remove function.
>
> Fixes: e3523e01869d ("ASoC: wm0010: Add initial wm0010 DSP driver")
> Fixes: fd8b96574456 ("ASoC: wm0010: Clear IRQ as wake source and include missing header")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
> ---
> Compile tested-only
> ---
> sound/soc/codecs/wm0010.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
> index edd2cb185c42..28b43fe4dc32 100644
> --- a/sound/soc/codecs/wm0010.c
> +++ b/sound/soc/codecs/wm0010.c
> @@ -920,7 +920,7 @@ static int wm0010_spi_probe(struct spi_device *spi)
> if (ret) {
> dev_err(wm0010->dev, "Failed to set IRQ %d as wake source: %d\n",
> irq, ret);
> - return ret;
> + goto free_riq;
typo? riq -> irq
> }
>
> if (spi->max_speed_hz)
> @@ -932,9 +932,18 @@ static int wm0010_spi_probe(struct spi_device *spi)
> &soc_component_dev_wm0010, wm0010_dai,
> ARRAY_SIZE(wm0010_dai));
> if (ret < 0)
> - return ret;
> + goto disable_irq_wake;
>
> return 0;
> +
> +disable_irq_wake:
> + irq_set_irq_wake(wm0010->irq, 0);
> +
> +free_riq:
> + if (wm0010->irq)
> + free_irq(wm0010->irq, wm0010);
> +
> + return ret;
> }
>
> static void wm0010_spi_remove(struct spi_device *spi)
Powered by blists - more mailing lists