mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
|
From 8f32d48a309246a80bdca505968085a484d54408 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ansuel Smith <ansuelsmth@gmail.com>
|
||
|
|
Date: Mon, 19 Apr 2021 03:01:53 +0200
|
||
|
|
Subject: [thermal-next PATCH v2 1/2] thermal: qcom: tsens: init debugfs only with
|
||
|
|
successful probe
|
||
|
|
|
||
|
|
calibrate and tsens_register can fail or PROBE_DEFER. This will cause a
|
||
|
|
double or a wrong init of the debugfs information. Init debugfs only
|
||
|
|
with successful probe fixing warning about directory already present.
|
||
|
|
|
||
|
|
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
||
|
|
Acked-by: Thara Gopinath <thara.gopinath@linaro.org>
|
||
|
|
---
|
||
|
|
drivers/thermal/qcom/tsens.c | 9 ++++++---
|
||
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/thermal/qcom/tsens.c
|
||
|
|
+++ b/drivers/thermal/qcom/tsens.c
|
||
|
|
@@ -918,8 +918,6 @@ int __init init_common(struct tsens_priv
|
||
|
|
if (tsens_version(priv) >= VER_0_1)
|
||
|
|
tsens_enable_irq(priv);
|
||
|
|
|
||
|
|
- tsens_debug_init(op);
|
||
|
|
-
|
||
|
|
err_put_device:
|
||
|
|
put_device(&op->dev);
|
||
|
|
return ret;
|
||
|
|
@@ -1155,7 +1153,12 @@ static int tsens_probe(struct platform_d
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- return tsens_register(priv);
|
||
|
|
+ ret = tsens_register(priv);
|
||
|
|
+
|
||
|
|
+ if (!ret)
|
||
|
|
+ tsens_debug_init(pdev);
|
||
|
|
+
|
||
|
|
+ return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
static int tsens_remove(struct platform_device *pdev)
|