summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-26 09:21:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-26 09:21:28 -0700
commit99015e94f2355f05d0b91f9fbe3877918a801e81 (patch)
tree9ada3c83d06130d00c1bd8d9f78442c0df532292 /drivers
parent6e77b267723c723d4717abc874e00059ab07a46a (diff)
parentbafaf056e0734f7bca7d27716bb3c672e87bb0b1 (diff)
downloadlinux-stable-99015e94f2355f05d0b91f9fbe3877918a801e81.tar.gz
linux-stable-99015e94f2355f05d0b91f9fbe3877918a801e81.tar.bz2
linux-stable-99015e94f2355f05d0b91f9fbe3877918a801e81.zip
Merge tag 'pm-4.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki: "Fix up the recently introduced cpufreq driver for Qualcomm Kryo processors by adding a terminating NULL entry to its table of device IDs (YueHaibing)" * tag 'pm-4.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: qcom-kryo: add NULL entry to the end of_device_id array
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/qcom-cpufreq-kryo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index 29389accf3e9..efc9a7ae4857 100644
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -183,6 +183,7 @@ static struct platform_driver qcom_cpufreq_kryo_driver = {
static const struct of_device_id qcom_cpufreq_kryo_match_list[] __initconst = {
{ .compatible = "qcom,apq8096", },
{ .compatible = "qcom,msm8996", },
+ {}
};
/*