Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89af529a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power management fixes from Rafael Wysocki:
 "These fix two bugs in error code paths in the cpufreq core and in the
  kirkwood-cpufreq driver.

  Specifics:

   - Make cpufreq_register_driver() return an error if the ->init()
     calls fail for all CPUs to prevent non-functional drivers from
     hanging around for no reason (David Arcari).

   - Make kirkwood-cpufreq check the return value of
     clk_prepare_enable() (which may fail) as appropriate (Arvind
     Yadav)"

* tag 'pm-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable()
  cpufreq: cpufreq_register_driver() should return -ENODEV if init fails
parents 5a4829b5 bb5710e7

drivers/cpufreq/cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -2468,6 +2468,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) 
	if (!(cpufreq_driver->flags & CPUFREQ_STICKY) &&

	    list_empty(&cpufreq_policy_list)) {

		/* if all ->init() calls failed, unregister */

		ret = -ENODEV;

		pr_debug("%s: No CPU initialized for driver %s\n", __func__,

			 driver_data->name);

		goto err_if_unreg;

drivers/cpufreq/kirkwood-cpufreq.c

+16 −3
Original line number Diff line number Diff line
@@ -127,7 +127,12 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev) 
		return PTR_ERR(priv.cpu_clk);

	}



	clk_prepare_enable(priv.cpu_clk);

	err = clk_prepare_enable(priv.cpu_clk);

	if (err) {

		dev_err(priv.dev, "Unable to prepare cpuclk\n");

		return err;

	}



	kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;



	priv.ddr_clk = of_clk_get_by_name(np, "ddrclk");
@@ -137,7 +142,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev) 
		goto out_cpu;

	}



	clk_prepare_enable(priv.ddr_clk);

	err = clk_prepare_enable(priv.ddr_clk);

	if (err) {

		dev_err(priv.dev, "Unable to prepare ddrclk\n");

		goto out_cpu;

	}

	kirkwood_freq_table[1].frequency = clk_get_rate(priv.ddr_clk) / 1000;



	priv.powersave_clk = of_clk_get_by_name(np, "powersave");
@@ -146,7 +155,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev) 
		err = PTR_ERR(priv.powersave_clk);

		goto out_ddr;

	}

	clk_prepare_enable(priv.powersave_clk);

	err = clk_prepare_enable(priv.powersave_clk);

	if (err) {

		dev_err(priv.dev, "Unable to prepare powersave clk\n");

		goto out_ddr;

	}



	of_node_put(np);

	np = NULL;