diff options
| author | Colin Cross <ccross@android.com> | 2010-12-16 23:09:45 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-12-16 23:09:45 -0800 |
| commit | 6ecd81511c7b8ba61e4874d3416e32561780f032 (patch) | |
| tree | 8d3b14e5875a723de34f79fb48b325a5ece67121 /drivers | |
| parent | 8afb3d34090820f4128e6e2182a7231423c47b28 (diff) | |
| parent | 7d99fb5c859827ef07fbd5f83f2e7165c2b3b234 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/tegra-aes.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/crypto/tegra-aes.c b/drivers/crypto/tegra-aes.c index 3ceb122292fb..12a019b94a79 100644 --- a/drivers/crypto/tegra-aes.c +++ b/drivers/crypto/tegra-aes.c @@ -878,6 +878,7 @@ static int tegra_aes_probe(struct platform_device *pdev) struct tegra_aes_dev *dd; struct resource *res; int err = -ENOMEM, i = 0, j; + bool clk_enabled = false; if (aes_dev) return -EEXIST; @@ -932,6 +933,7 @@ static int tegra_aes_probe(struct platform_device *pdev) err = -ENODEV; goto out; } + clk_enabled = true; /* * the foll contiguous memory is allocated as follows - @@ -991,6 +993,8 @@ static int tegra_aes_probe(struct platform_device *pdev) goto out; } + clk_disable(dd->iclk); + dev_info(dev, "registered"); return 0; @@ -1008,6 +1012,8 @@ out: dd->buf_out, dd->dma_buf_out); if (dd->io_base) iounmap(dd->io_base); + if (clk_enabled) + clk_disable(dd->iclk); if (dd->iclk) clk_put(dd->iclk); |