diff options
| author | Michael Turquette <mturquette@linaro.org> | 2014-12-11 12:17:15 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2014-12-11 12:17:15 -0800 |
| commit | c9b928148eb430bc2beb486d94efd2c3bc439a0c (patch) | |
| tree | 9bae414dc6a2e926eef9cec8d7df0480db96271e /drivers/clk/samsung/clk-exynos-audss.c | |
| parent | 74fc23aa40525695e47d6988f9c0a501e39ef01d (diff) | |
| parent | c31844ffdbd4e73a16c66e9d7df8ec290ab4b159 (diff) | |
Merge tag 'for-v3.19-exynos-clk-2' of git://linuxtv.org/snawrocki/samsung into clk-next
- exynos4415 and exynos audio subsystem clk driver (build
with PM_SLEEP disabled, resource release) fixes
- minor cleanups in drivers/clk/samsung/clk.c (spelling,
includes)
- modification of the exynos4 HDMI PHY clock definition to
model dependency of "sclk_hdmiphy" on the "hdmi" clock
Diffstat (limited to 'drivers/clk/samsung/clk-exynos-audss.c')
| -rw-r--r-- | drivers/clk/samsung/clk-exynos-audss.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/clk/samsung/clk-exynos-audss.c b/drivers/clk/samsung/clk-exynos-audss.c index 13eae14c2cc2..b50469faf70c 100644 --- a/drivers/clk/samsung/clk-exynos-audss.c +++ b/drivers/clk/samsung/clk-exynos-audss.c @@ -210,6 +210,10 @@ static int exynos_audss_clk_remove(struct platform_device *pdev) { int i; +#ifdef CONFIG_PM_SLEEP + unregister_syscore_ops(&exynos_audss_clk_syscore_ops); +#endif + of_clk_del_provider(pdev->dev.of_node); for (i = 0; i < clk_data.clk_num; i++) { |