cpufreq: imx6q: fix error handling (3646f50a) · Commits · 戴 / test

When speed checking failed, direclty jumping to put_node label is not correct. Need jump to out_free_opp to avoid resources leak. Fixes: ("cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull") Signed-off-by:

Peng Fan <peng.fan@nxp.com> Signed-off-by:

Viresh Kumar <viresh.kumar@linaro.org>

drivers/cpufreq/imx6q-cpufreq.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -381,23 +381,24 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
		goto put_reg;
		}

		/* Because we have added the OPPs here, we must free them */
		free_opp = true;

		if (of_machine_is_compatible("fsl,imx6ul") \|\|
		of_machine_is_compatible("fsl,imx6ull")) {
		ret = imx6ul_opp_check_speed_grading(cpu_dev);
		if (ret) {
		if (ret == -EPROBE_DEFER)
		goto put_node;
		goto out_free_opp;

		dev_err(cpu_dev, "failed to read ocotp: %d\n",
		ret);
		goto put_node;
		goto out_free_opp;
		}
		} else {
		imx6q_opp_check_speed_grading(cpu_dev);
		}

		/* Because we have added the OPPs here, we must free them */
		free_opp = true;
		num = dev_pm_opp_get_opp_count(cpu_dev);
		if (num < 0) {
		ret = num;

Admin message