| Message ID | cea3317c5d793db312064d68b261ad420a4a81b1.1576146898.git.amit.kucheria@linaro.org |
|---|---|
| State | Accepted |
| Commit | 344fa0bad6932204146d305607790340f2324a90 |
| Headers | show |
| Series | [v2] drivers: thermal: tsens: Work with old DTBs | expand |
On Mon, Dec 16, 2019 at 2:58 PM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > On 12/12/2019 11:38, Amit Kucheria wrote: > > In order for the old DTBs to continue working, the new interrupt code > > must not return an error if interrupts are not defined. Don't return an > > error in case of -ENXIO. > > > > Fixes: 634e11d5b450a ("drivers: thermal: tsens: Add interrupt support") > > Suggested-by: Stephan Gerhold <stephan@gerhold.net> > > Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> > > Applied. Hi Daniel, I haven't seen this fix until -rc4. Do you plan to send it? Regards, Amit
On Thu, Jan 2, 2020 at 3:14 AM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > On 01/01/2020 22:15, Amit Kucheria wrote: > > On Mon, Dec 16, 2019 at 2:58 PM Daniel Lezcano > > <daniel.lezcano@linaro.org> wrote: > >> > >> On 12/12/2019 11:38, Amit Kucheria wrote: > >>> In order for the old DTBs to continue working, the new interrupt code > >>> must not return an error if interrupts are not defined. Don't return an > >>> error in case of -ENXIO. > >>> > >>> Fixes: 634e11d5b450a ("drivers: thermal: tsens: Add interrupt support") > >>> Suggested-by: Stephan Gerhold <stephan@gerhold.net> > >>> Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> > >> > >> Applied. > > > > Hi Daniel, > > > > I haven't seen this fix until -rc4. Do you plan to send it? > > Hi Amit, > > right, I've put it in the thermal/linux-next branch. I'll move it to > thermal/fixes and send a PR tomorrow. Thanks.
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 015e7d2015985..0e7cf52369326 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; }
In order for the old DTBs to continue working, the new interrupt code must not return an error if interrupts are not defined. Don't return an error in case of -ENXIO. Fixes: 634e11d5b450a ("drivers: thermal: tsens: Add interrupt support") Suggested-by: Stephan Gerhold <stephan@gerhold.net> Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> --- drivers/thermal/qcom/tsens.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.20.1