diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-07-30 11:27:01 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-07-30 11:27:01 +0200 |
| commit | 5a4c996764da496afcc470a6e13dc23a8f55aca8 (patch) | |
| tree | 3a4072147bcb22100ddad6c537aa8a890f32daf4 /drivers/cpufreq/qcom-cpufreq-kryo.c | |
| parent | cpufreq: qcom-kryo: add NULL entry to the end of_device_id array (diff) | |
| parent | cpufreq: Fix a circular lock dependency problem (diff) | |
| download | linux-5a4c996764da496afcc470a6e13dc23a8f55aca8.tar.xz linux-5a4c996764da496afcc470a6e13dc23a8f55aca8.zip | |
Merge back cpufreq material for 4.19.
Diffstat (limited to 'drivers/cpufreq/qcom-cpufreq-kryo.c')
| -rw-r--r-- | drivers/cpufreq/qcom-cpufreq-kryo.c | 5 |
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); } |