[PATCH] spi: micro: fix unreasonable clk_prepare_enable() on error in mchp_corespi_probe()

[PATCH] spi: micro: fix unreasonable clk_prepare_enable() on error in mchp_corespi_probe()

[Peng Wu]

Fix the unreasonable clk_prepare_enable() with clk_disable_unprepare()
before return from mchp_corespi_probe() in the error handling case.

Signed-off-by: Peng Wu <wupeng58@huawei.com>
---
 drivers/spi/spi-microchip-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c
index 5b2aee30fa04..bf6847d95fe3 100644
--- a/drivers/spi/spi-microchip-core.c
+++ b/drivers/spi/spi-microchip-core.c
@@ -580,7 +580,7 @@ static int mchp_corespi_probe(struct platform_device *pdev)
 
 error_release_hardware:
 	mchp_corespi_disable(spi);
-	clk_prepare_enable(spi->clk);
+	clk_disable_unprepare(spi->clk);
 error_release_master:
 	spi_master_put(master);
 
-- 
2.17.1

Re: [PATCH] spi: micro: fix unreasonable clk_prepare_enable() on error in mchp_corespi_probe()

[Conor.Dooley]

On 11/06/2022 03:11, Peng Wu wrote:
> spi: micro: fix unreasonable clk_prepare_enable() on error in mchp_corespi_probe()

       ^ s/micro/microchip-core ?

> 
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Fix the unreasonable clk_prepare_enable() with clk_disable_unprepare()
> before return from mchp_corespi_probe() in the error handling case.
> 
> Signed-off-by: Peng Wu <wupeng58@huawei.com>

"unreasonable", very diplomatic way of putting it!

Good spot, thanks.
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

> ---
>  drivers/spi/spi-microchip-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c
> index 5b2aee30fa04..bf6847d95fe3 100644
> --- a/drivers/spi/spi-microchip-core.c
> +++ b/drivers/spi/spi-microchip-core.c
> @@ -580,7 +580,7 @@ static int mchp_corespi_probe(struct platform_device *pdev)
> 
>  error_release_hardware:
>         mchp_corespi_disable(spi);
> -       clk_prepare_enable(spi->clk);
> +       clk_disable_unprepare(spi->clk);
>  error_release_master:
>         spi_master_put(master);
> 
> --
> 2.17.1
> 

Re: [PATCH] spi: micro: fix unreasonable clk_prepare_enable() on error in mchp_corespi_probe()

[Mark Brown]

On Sat, 11 Jun 2022 02:11:17 +0000, Peng Wu wrote:
> Fix the unreasonable clk_prepare_enable() with clk_disable_unprepare()
> before return from mchp_corespi_probe() in the error handling case.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: micro: fix unreasonable clk_prepare_enable() on error in mchp_corespi_probe()
      commit: 116679aef2f92d535ea8049ef2a610bc73f94660

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark