[ Upstream commit fc7d18cf6a923cde7f5e7ba2c1105bb106d3e29a ]

We print a calibration failure message on -EPROBE_DEFER from
nvmem/qfprom as follows:
[    3.003090] qcom-tsens 4a9000.thermal-sensor: version: 1.4
[    3.005376] qcom-tsens 4a9000.thermal-sensor: tsens calibration failed
[    3.113248] qcom-tsens 4a9000.thermal-sensor: version: 1.4

This confuses people when, in fact, calibration succeeds later when
nvmem/qfprom device is available. Don't print this message on a
-EPROBE_DEFER.

Signed-off-by: Amit Kucheria <amit.kuche...@linaro.org>
Signed-off-by: Eduardo Valentin <edubez...@gmail.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/thermal/qcom/tsens.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 3f9fe6aa51cc..ebbe1ec7b9e8 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -162,7 +162,8 @@ static int tsens_probe(struct platform_device *pdev)
        if (tmdev->ops->calibrate) {
                ret = tmdev->ops->calibrate(tmdev);
                if (ret < 0) {
-                       dev_err(dev, "tsens calibration failed\n");
+                       if (ret != -EPROBE_DEFER)
+                               dev_err(dev, "tsens calibration failed\n");
                        return ret;
                }
        }
-- 
2.20.1



Reply via email to