summaryrefslogtreecommitdiff
path: root/drivers/cpufreq/qcom-cpufreq-kryo.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-07-30 12:27:01 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-07-30 12:27:01 +0300
commit5a4c996764da496afcc470a6e13dc23a8f55aca8 (patch)
tree3a4072147bcb22100ddad6c537aa8a890f32daf4 /drivers/cpufreq/qcom-cpufreq-kryo.c
parentbafaf056e0734f7bca7d27716bb3c672e87bb0b1 (diff)
parent9b3d9bb3e4deef41095e513c2ffbebab20f9a982 (diff)
downloadlinux-5a4c996764da496afcc470a6e13dc23a8f55aca8.tar.xz
Merge back cpufreq material for 4.19.
Diffstat (limited to 'drivers/cpufreq/qcom-cpufreq-kryo.c')
-rw-r--r--drivers/cpufreq/qcom-cpufreq-kryo.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index efc9a7ae4857..a1830fa25fc5 100644
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -109,8 +109,9 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
speedbin_nvmem = of_nvmem_cell_get(np, NULL);
of_node_put(np);
if (IS_ERR(speedbin_nvmem)) {
- dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",
- PTR_ERR(speedbin_nvmem));
+ if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER)
+ dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",
+ PTR_ERR(speedbin_nvmem));
return PTR_ERR(speedbin_nvmem);
}