Re: [PATCH v2 2/2] spi: meson-spicc: fix a wrong goto jump for avoiding memory leak.

From: Neil Armstrong
Date: Mon Jun 14 2021 - 09:09:56 EST


Hi,

On 13/06/2021 07:29, zpershuai wrote:
> In meson_spifc_probe function, when enable the device pclk clock is
> error, it should use clk_disable_unprepare to release the core clock.
>
> Signed-off-by: zpershuai <zpershuai@xxxxxxxxx>
> ---
> drivers/spi/spi-meson-spicc.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c
> index d675334..b2c4621 100644
> --- a/drivers/spi/spi-meson-spicc.c
> +++ b/drivers/spi/spi-meson-spicc.c
> @@ -725,7 +725,7 @@ static int meson_spicc_probe(struct platform_device *pdev)
> ret = clk_prepare_enable(spicc->pclk);
> if (ret) {
> dev_err(&pdev->dev, "pclk clock enable failed\n");
> - goto out_master;
> + goto out_core_clk;
> }
>
> device_reset_optional(&pdev->dev);
> @@ -764,9 +764,11 @@ static int meson_spicc_probe(struct platform_device *pdev)
> return 0;
>
> out_clk:
> - clk_disable_unprepare(spicc->core);
> clk_disable_unprepare(spicc->pclk);
>
> +out_core_clk:
> + clk_disable_unprepare(spicc->core);
> +
> out_master:
> spi_master_put(master);
>
>

Reviewed-by: Neil Armstrong <narmstrong@xxxxxxxxxxxx>