2022-06-12 21:16:29

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH] p54: Fix an error handling path in p54spi_probe()

On 6/12/22 14:54, Christophe JAILLET wrote:
> If an error occurs after a successful call to p54spi_request_firmware(), it
> must be undone by a corresponding release_firmware() as already done in
> the error handling path of p54spi_request_firmware() and in the .remove()
> function.
>
> Add the missing call in the error handling path and update some goto
> label accordingly.
>
> Fixes: cd8d3d321285 ("p54spi: p54spi driver")
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/net/wireless/intersil/p54/p54spi.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c
> index f99b7ba69fc3..679ac164c994 100644
> --- a/drivers/net/wireless/intersil/p54/p54spi.c
> +++ b/drivers/net/wireless/intersil/p54/p54spi.c
> @@ -650,14 +650,16 @@ static int p54spi_probe(struct spi_device *spi)
>
> ret = p54spi_request_eeprom(hw);
> if (ret)
> - goto err_free_common;
> + goto err_release_firmaware;
>
> ret = p54_register_common(hw, &priv->spi->dev);
> if (ret)
> - goto err_free_common;
> + goto err_release_firmaware;
>
> return 0;
>
> +err_release_firmaware:
> + release_firmware(priv->firmware);
> err_free_common:
> free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
> err_free_gpio_irq:

Why "err_release_firmaware" rather than "err_release_firmware"? Otherwise the
patch looks good.

Larry