Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / picoxcell_crypto.c

diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c
index c2fd860745adffcfa5fb55edf92bccf70011e3bc..4f56f3681abdfc6e2a4ecf95e34f3ea30c231961 100644 (file)
--- a/drivers/crypto/picoxcell_crypto.c
+++ b/drivers/crypto/picoxcell_crypto.c
@@ -1755,15 +1755,15 @@ static int spacc_probe(struct platform_device *pdev)
                return PTR_ERR(engine->clk);
        }
 
-       if (clk_enable(engine->clk)) {
-               dev_info(&pdev->dev, "unable to enable clk\n");
+       if (clk_prepare_enable(engine->clk)) {
+               dev_info(&pdev->dev, "unable to prepare/enable clk\n");
                clk_put(engine->clk);
                return -EIO;
        }
 
        err = device_create_file(&pdev->dev, &dev_attr_stat_irq_thresh);
        if (err) {
-               clk_disable(engine->clk);
+               clk_disable_unprepare(engine->clk);
                clk_put(engine->clk);
                return err;
        }
@@ -1831,7 +1831,7 @@ static int spacc_remove(struct platform_device *pdev)
                crypto_unregister_alg(&alg->alg);
        }
 
-       clk_disable(engine->clk);
+       clk_disable_unprepare(engine->clk);
        clk_put(engine->clk);
 
        return 0;