[source] ar71xx: spi-rb4xx: balance clk_prepare_enable() call

LEDE Commits lede-commits at lists.infradead.org
Sun Dec 24 00:03:19 PST 2017


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/6456999731fa8d22419ffeef9c1710e484620c80

commit 6456999731fa8d22419ffeef9c1710e484620c80
Author: Gabor Juhos <juhosg at freemail.hu>
AuthorDate: Tue Dec 19 08:24:38 2017 +0100

    ar71xx: spi-rb4xx: balance clk_prepare_enable() call
    
    Commit c312cef223dd ("ar71xx: spi-rb4xx fix.") replaced the clk_enable() call
    with clk_prepare_enable() to meet the common clock framework requirements.
    However it did not change the clk_disable() call in the error patch which
    thus leads to imbalance.
    
    Fix the code by using the correct counterpart of clk_prepare_enable() in both
    places.
    
    Fixes: c312cef223dd ("ar71xx: spi-rb4xx fix.")
    Signed-off-by: Gabor Juhos <juhosg at freemail.hu>
---
 target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c b/target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c
index 9175fc7..2d95e80 100644
--- a/target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c
+++ b/target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c
@@ -379,7 +379,7 @@ static int rb4xx_spi_probe(struct platform_device *pdev)
 err_iounmap:
 	iounmap(rbspi->base);
 err_clk_disable:
-	clk_disable(rbspi->ahb_clk);
+	clk_disable_unprepare(rbspi->ahb_clk);
 err_clk_put:
 	clk_put(rbspi->ahb_clk);
 err_put_master:
@@ -394,7 +394,7 @@ static int rb4xx_spi_remove(struct platform_device *pdev)
 	struct rb4xx_spi *rbspi = platform_get_drvdata(pdev);
 
 	iounmap(rbspi->base);
-	clk_disable(rbspi->ahb_clk);
+	clk_disable_unprepare(rbspi->ahb_clk);
 	clk_put(rbspi->ahb_clk);
 	platform_set_drvdata(pdev, NULL);
 	spi_master_put(rbspi->master);



More information about the lede-commits mailing list