Commit ab6efe68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 16c957f0 5a5adb15

drivers/cpufreq/mediatek-cpufreq.c

+6 −2
Original line number Diff line number Diff line
@@ -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);