Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Mike Looijmans <mike.looijmans@topic.nl>
Link: https://lore.kernel.org/r/20230802064100.15793-2-mike.looijmans@topic.nl
Reviewed-by: Liam Beguin <liambeguin@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Mike Looijmans and committed by
Stephen Boyd
e63227c8 f6d6c11f

+4 -7
+4 -7
drivers/clk/clk-lmk04832.c
··· 1505 1505 ret = clk_set_rate(lmk->vco.clk, lmk->vco_rate); 1506 1506 if (ret) { 1507 1507 dev_err(lmk->dev, "failed to set VCO rate\n"); 1508 - goto err_disable_vco; 1508 + goto err_disable_oscin; 1509 1509 } 1510 1510 } 1511 1511 1512 1512 ret = lmk04832_register_sclk(lmk); 1513 1513 if (ret) { 1514 1514 dev_err(lmk->dev, "failed to init SYNC/SYSREF clock path\n"); 1515 - goto err_disable_vco; 1515 + goto err_disable_oscin; 1516 1516 } 1517 1517 1518 1518 for (i = 0; i < info->num_channels; i++) { 1519 1519 ret = lmk04832_register_clkout(lmk, i); 1520 1520 if (ret) { 1521 1521 dev_err(lmk->dev, "failed to register clk %d\n", i); 1522 - goto err_disable_vco; 1522 + goto err_disable_oscin; 1523 1523 } 1524 1524 } 1525 1525 ··· 1528 1528 lmk->clk_data); 1529 1529 if (ret) { 1530 1530 dev_err(lmk->dev, "failed to add provider (%d)\n", ret); 1531 - goto err_disable_vco; 1531 + goto err_disable_oscin; 1532 1532 } 1533 1533 1534 1534 spi_set_drvdata(spi, lmk); 1535 1535 1536 1536 return 0; 1537 - 1538 - err_disable_vco: 1539 - clk_disable_unprepare(lmk->vco.clk); 1540 1537 1541 1538 err_disable_oscin: 1542 1539 clk_disable_unprepare(lmk->oscin);