Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357725
b: refs/heads/master
c: 5c22ba6
h: refs/heads/master
i:
  357723: 74f7599
v: v3
  • Loading branch information
Jingoo Han authored and Herbert Xu committed Jan 19, 2013
1 parent bf65367 commit fed1194
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f9fb69e73c774a6490a13128381af9ba468d3a6e
refs/heads/master: 5c22ba6619796da82ea0aa18c72caf4fe003a329
4 changes: 1 addition & 3 deletions trunk/drivers/crypto/s5p-sss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit fed1194

Please sign in to comment.