Merge tag 'thermal-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux

torvalds · torvalds · commit 658e1af5eec6 · 2020-01-10T11:48:37.000-08:00
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
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,9 @@ static int tsens_register(struct tsens_priv *priv)`
`110`	`110`	`irq = platform_get_irq_byname(pdev, "uplow");`
`111`	`111`	`if (irq < 0) {`
`112`	`112`	`ret = irq;`
	`113`	`+ /* For old DTs with no IRQ defined */`
	`114`	`+ if (irq == -ENXIO)`
	`115`	`+ ret = 0;`
`113`	`116`	`goto err_put_device;`
`114`	`117`	`}`
`115`	`118`