Merge "qcom: msm-pm: Do not fail on L2 clk get failure" (f4e2d412) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/qcom/msm-pm.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -308,12 +308,7 @@ static int ramp_up_first_cpu(int cpu, int saved_rate)
		pr_info("CPU%u: %s: restore clock rate\n",
		cpu, __func__);

		if (l2_clk) {
		rc = clk_enable(l2_clk);
		if (rc)
		pr_err("%s(): Error restoring l2 clk\n",
		__func__);
		}
		clk_enable(l2_clk);

		if (cpu_clk) {
		int ret = clk_enable(cpu_clk);
		@@ -800,8 +795,11 @@ static int msm_pm_clk_init(struct platform_device *pdev)
		return 0;

		l2_clk = devm_clk_get(&pdev->dev, "l2_clk");
		if (IS_ERR(l2_clk))
		pr_warn("%s: Could not get l2_clk (-%ld)\n", __func__,
		PTR_ERR(l2_clk));

		return PTR_RET(l2_clk);
		return 0;
		}

		static int msm_cpu_pm_probe(struct platform_device *pdev)