Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+7 -2
+7 -2
drivers/opp/core.c
··· 1092 1092 if (IS_ERR(opp_table->clk)) { 1093 1093 ret = PTR_ERR(opp_table->clk); 1094 1094 if (ret == -EPROBE_DEFER) 1095 - goto err; 1095 + goto remove_opp_dev; 1096 1096 1097 1097 dev_dbg(dev, "%s: Couldn't find clock: %d\n", __func__, ret); 1098 1098 } ··· 1101 1101 ret = dev_pm_opp_of_find_icc_paths(dev, opp_table); 1102 1102 if (ret) { 1103 1103 if (ret == -EPROBE_DEFER) 1104 - goto err; 1104 + goto put_clk; 1105 1105 1106 1106 dev_warn(dev, "%s: Error finding interconnect paths: %d\n", 1107 1107 __func__, ret); ··· 1113 1113 1114 1114 return opp_table; 1115 1115 1116 + put_clk: 1117 + if (!IS_ERR(opp_table->clk)) 1118 + clk_put(opp_table->clk); 1119 + remove_opp_dev: 1120 + _remove_opp_dev(opp_dev, opp_table); 1116 1121 err: 1117 1122 kfree(opp_table); 1118 1123 return ERR_PTR(ret);