summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-01-10 11:48:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-01-10 11:48:37 -0800
commit658e1af5eec6d51f95fa81e61f67d2fe1c6376aa (patch)
tree2fb86862d88b2408e388a76c7f8ba83da569db60 /drivers
parentc23e744b59efcf546b2b16834c68b85248d6bf3b (diff)
parent344fa0bad6932204146d305607790340f2324a90 (diff)
Merge tag 'thermal-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Pull thermal fix from Daniel Lezcano: "Fix backward compatibility with old DTBs on QCOM tsens (Amit Kucheria)" * tag 'thermal-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: drivers: thermal: tsens: Work with old DTBs
Diffstat (limited to 'drivers')
-rw-r--r--drivers/thermal/qcom/tsens.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 015e7d201598..0e7cf5236932 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -110,6 +110,9 @@ static int tsens_register(struct tsens_priv *priv)
irq = platform_get_irq_byname(pdev, "uplow");
if (irq < 0) {
ret = irq;
+ /* For old DTs with no IRQ defined */
+ if (irq == -ENXIO)
+ ret = 0;
goto err_put_device;
}