leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Power management fix for 5.19-rc7

Browse Source 
Fix recent regression in the cpufreq mediatek driver related
 to incorrect handling of regulator_get_optional() return
 value (AngeloGioacchino Del Regno).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmLRsd4SHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRx1NYP/16VAQr1svy/7i4j4vPXLPkU1umCJJJC
 4GdDSl8gdS/3TsKkEaXw3pRLZ5HXeTC62493DvoMJnbuHVOkWasuvTMPMsu0FI5a
 y/eolwF7mVkkSwvr/Udgsap+x/ONlQIuIto5hJWEBLwI+gXDzZxVu5MGwMc1xhtq
 +xOOlisO05RWsbkzPKOduN199wcZ/oNbvBKsevETsD1zCnIueLbOLpyFWd1gMeEG
 6sAYm4CcyLYScoW7NsorVqVU1raCN9CLamY+GhqXgdCMqEZHoEiAErj5f2SOLcCh
 8e4x6f8nxHd55BLY4pmKYlWmx/xr5sU9ulUEv6OIQYzODJt+GN6qXjCkMYJW0Aj1
 DlVgFIwQToGLvSiqiToerV86XcMTfWVvjAPQUElblrFZF12VAAV9YcYCwWNVwc2W
 0z6duzYW8rRIjK/mXgbIc6K6yP3vS7HhGr/kX0+fevWnTUPrm3s4IxzG9rGNDy7p
 qGMcXAV06bYX7Dt+ZQCZd5LPFhgLwLKY62Eds2Z+55cMq4zwT56CNO6siUphp9MJ
 3LvV3ZJxg/lI4c7PPSYV6yP1DBLchNra0kganCGEnoJ24s59esdjKlSRC6Xp+aDE
 2Yh2lt8FCYXdIYwQwiF493qiSClBSuXljbk+QvJFb1PYWpkIEcFMFXFg9WBzarFD
 aD7eLRLUSkWd
 =jx62
 -----END PGP SIGNATURE-----

Merge tag 'pm-5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki
 "Fix recent regression in the cpufreq mediatek driver related to
  incorrect handling of regulator_get_optional() return value
  (AngeloGioacchino Del Regno)"

* tag 'pm-5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: mediatek: Handle sram regulator probe deferral
This commit is contained in:
Linus Torvalds 2022-07-16 10:56:28 -07:00
commit ab6efe68a7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/cpufreq/mediatek-cpufreq.c
View File

@ -439,9 +439,13 @@ static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)
/* Both presence and absence of sram regulator are valid cases. */
info->sram_reg = regulator_get_optional(cpu_dev, "sram");
if (IS_ERR(info->sram_reg))
if (IS_ERR(info->sram_reg)) {
ret = PTR_ERR(info->sram_reg);
if (ret == -EPROBE_DEFER)
goto out_free_resources;
info->sram_reg = NULL;
else {
} else {
ret = regulator_enable(info->sram_reg);
if (ret) {
dev_warn(cpu_dev, "cpu%d: failed to enable vsram\n", cpu);