Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 255226
b: refs/heads/master
c: 101ed47
h: refs/heads/master
v: v3
  • Loading branch information
Balaji T K authored and Chris Ball committed Jul 20, 2011
1 parent 78296ad commit 237d798
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 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: fa4aa2d48dabed9d1288d235524cb8d0a8e81c00
refs/heads/master: 101ed47e01516adeffeb4769df77b9207e6ba48a
10 changes: 0 additions & 10 deletions trunk/drivers/mmc/host/omap_hsmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ struct omap_hsmmc_host {
struct mmc_command *cmd;
struct mmc_data *data;
struct clk *fclk;
struct clk *iclk;
struct clk *dbclk;
/*
* vcc == configured supply
Expand Down Expand Up @@ -1935,17 +1934,10 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)

spin_lock_init(&host->irq_lock);

host->iclk = clk_get(&pdev->dev, "ick");
if (IS_ERR(host->iclk)) {
ret = PTR_ERR(host->iclk);
host->iclk = NULL;
goto err1;
}
host->fclk = clk_get(&pdev->dev, "fck");
if (IS_ERR(host->fclk)) {
ret = PTR_ERR(host->fclk);
host->fclk = NULL;
clk_put(host->iclk);
goto err1;
}

Expand Down Expand Up @@ -2103,7 +2095,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
pm_runtime_mark_last_busy(host->dev);
pm_runtime_put_autosuspend(host->dev);
clk_put(host->fclk);
clk_put(host->iclk);
if (host->got_dbclk) {
clk_disable(host->dbclk);
clk_put(host->dbclk);
Expand Down Expand Up @@ -2139,7 +2130,6 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
pm_runtime_put_sync(host->dev);
pm_runtime_disable(host->dev);
clk_put(host->fclk);
clk_put(host->iclk);
if (host->got_dbclk) {
clk_disable(host->dbclk);
clk_put(host->dbclk);
Expand Down

0 comments on commit 237d798

Please sign in to comment.