diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-30 10:38:59 +0400 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-30 10:38:59 +0400 |
| commit | 82de1bc86c493ad832db270635fbf4e8c237f02f (patch) | |
| tree | f70562cf3ae0a777ff55da734466627e2ab2478c /drivers/clk/ti/clk-dra7-atl.c | |
| parent | 6e18ff26c2b529de06207caa2be9e5f1cf520972 (diff) | |
| parent | 04ed831f224d4553682f48e1b4a6b68f2622b68e (diff) | |
| download | linux-82de1bc86c493ad832db270635fbf4e8c237f02f.tar.xz | |
Merge branch 'for-v3.18/ti-clk-driver' of github.com:t-kristo/linux-pm into clk-next
Diffstat (limited to 'drivers/clk/ti/clk-dra7-atl.c')
| -rw-r--r-- | drivers/clk/ti/clk-dra7-atl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/ti/clk-dra7-atl.c b/drivers/clk/ti/clk-dra7-atl.c index 990e1d9edc01..59bb4b39d12e 100644 --- a/drivers/clk/ti/clk-dra7-atl.c +++ b/drivers/clk/ti/clk-dra7-atl.c @@ -203,6 +203,7 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node) if (!IS_ERR(clk)) { of_clk_add_provider(node, of_clk_src_simple_get, clk); + kfree(parent_names); return; } cleanup: @@ -228,6 +229,7 @@ static int of_dra7_atl_clk_probe(struct platform_device *pdev) cinfo->iobase = of_iomap(node, 0); cinfo->dev = &pdev->dev; pm_runtime_enable(cinfo->dev); + pm_runtime_irq_safe(cinfo->dev); pm_runtime_get_sync(cinfo->dev); atl_write(cinfo, DRA7_ATL_PCLKMUX_REG(0), DRA7_ATL_PCLKMUX); |