Commit e63227c8 authored by Mike Looijmans's avatar Mike Looijmans Committed by Stephen Boyd
Browse files

clk: lmk04832: Don't disable vco clock on probe fail 



The probe() method never calls clk_prepare_enable(), so it should not
call clk_disable_unprepare() for the vco.clk in the error path. Fixes
a "lmk-vco already disabled" BUG when probe fails.

Signed-off-by: default avatarMike Looijmans <mike.looijmans@topic.nl>
Link: https://lore.kernel.org/r/20230802064100.15793-2-mike.looijmans@topic.nl


Reviewed-by: default avatarLiam Beguin <liambeguin@gmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent f6d6c11f

drivers/clk/clk-lmk04832.c

+4 −7
Original line number Diff line number Diff line
@@ -1505,21 +1505,21 @@ static int lmk04832_probe(struct spi_device *spi) 
		ret = clk_set_rate(lmk->vco.clk, lmk->vco_rate);

		if (ret) {

			dev_err(lmk->dev, "failed to set VCO rate\n");

			goto err_disable_vco;

			goto err_disable_oscin;

		}

	}



	ret = lmk04832_register_sclk(lmk);

	if (ret) {

		dev_err(lmk->dev, "failed to init SYNC/SYSREF clock path\n");

		goto err_disable_vco;

		goto err_disable_oscin;

	}



	for (i = 0; i < info->num_channels; i++) {

		ret = lmk04832_register_clkout(lmk, i);

		if (ret) {

			dev_err(lmk->dev, "failed to register clk %d\n", i);

			goto err_disable_vco;

			goto err_disable_oscin;

		}

	}
@@ -1528,16 +1528,13 @@ static int lmk04832_probe(struct spi_device *spi) 
					  lmk->clk_data);

	if (ret) {

		dev_err(lmk->dev, "failed to add provider (%d)\n", ret);

		goto err_disable_vco;

		goto err_disable_oscin;

	}



	spi_set_drvdata(spi, lmk);



	return 0;



err_disable_vco:

	clk_disable_unprepare(lmk->vco.clk);



err_disable_oscin:

	clk_disable_unprepare(lmk->oscin);