From: Linus Torvalds Date: Fri, 2 Jun 2017 23:33:33 +0000 (-0700) Subject: Merge tag 'pm-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=89af529a6469d612258fce5745a7d45430f316ce;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'pm-4.12-rc4' of git://git./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 --- 89af529a6469d612258fce5745a7d45430f316ce