ar71xx: spi-rb4xx: balance clk_prepare_enable() call
authorGabor Juhos <juhosg@freemail.hu>
Tue, 19 Dec 2017 07:24:38 +0000 (08:24 +0100)
committerJohn Crispin <john@phrozen.org>
Sun, 24 Dec 2017 08:03:01 +0000 (09:03 +0100)
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@freemail.hu>
target/linux/ar71xx/files/drivers/spi/spi-rb4xx.c

index 9175fc7..2d95e80 100644 (file)
@@ -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);