Commit 977a3b0f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Pull operating performance points (OPP) framework fixes for 5.11-rc2
from Viresh Kumar:

"This contains two patches to fix freeing of resources in error paths."

* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  opp: Call the missing clk_put() on error
  opp: fix memory leak in _allocate_opp_table
parents 5c8fe583 0e1d9ca1

drivers/opp/core.c

+7 −2
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index) 
	if (IS_ERR(opp_table->clk)) {

		ret = PTR_ERR(opp_table->clk);

		if (ret == -EPROBE_DEFER)

			goto err;

			goto remove_opp_dev;



		dev_dbg(dev, "%s: Couldn't find clock: %d\n", __func__, ret);

	}
@@ -1101,7 +1101,7 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index) 
	ret = dev_pm_opp_of_find_icc_paths(dev, opp_table);

	if (ret) {

		if (ret == -EPROBE_DEFER)

			goto err;

			goto put_clk;



		dev_warn(dev, "%s: Error finding interconnect paths: %d\n",

			 __func__, ret);
@@ -1113,6 +1113,11 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index) 


	return opp_table;



put_clk:

	if (!IS_ERR(opp_table->clk))

		clk_put(opp_table->clk);

remove_opp_dev:

	_remove_opp_dev(opp_dev, opp_table);

err:

	kfree(opp_table);

	return ERR_PTR(ret);