Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / drivers / crypto / s5p-sss.c

diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index 49ad8cb..4b31432 100644 (file)
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -580,7 +580,7 @@ static int s5p_aes_probe(struct platform_device *pdev)
                                     resource_size(res), pdev->name))
                return -EBUSY;
 
-       pdata->clk = clk_get(dev, "secss");
+       pdata->clk = devm_clk_get(dev, "secss");
        if (IS_ERR(pdata->clk)) {
                dev_err(dev, "failed to find secss clock source\n");
                return -ENOENT;
@@ -645,7 +645,6 @@ static int s5p_aes_probe(struct platform_device *pdev)
 
  err_irq:
        clk_disable(pdata->clk);
-       clk_put(pdata->clk);
 
        s5p_dev = NULL;
        platform_set_drvdata(pdev, NULL);
@@ -667,7 +666,6 @@ static int s5p_aes_remove(struct platform_device *pdev)
        tasklet_kill(&pdata->tasklet);
 
        clk_disable(pdata->clk);
-       clk_put(pdata->clk);
 
        s5p_dev = NULL;
        platform_set_drvdata(pdev, NULL);