Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffbcdf8a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Eduardo Valentin
Browse files

thermal: rcar: check irq possibility in rcar_thermal_irq_xxx() 



Current rcar thermal driver sometimes checks irq possibility when it
calls rcar_thermal_irq_enable/disable(), but sometimes not.
This patch checks it inside rcar_thermal_irq_enable/disable().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent a1ade565

drivers/thermal/rcar_thermal.c

+5 −4
Original line number Diff line number Diff line
@@ -290,6 +290,9 @@ static void _rcar_thermal_irq_ctrl(struct rcar_thermal_priv *priv, int enable) 
	unsigned long flags;

	u32 mask = 0x3 << rcar_id_to_shift(priv); /* enable Rising/Falling */



	if (!rcar_has_irq_support(priv))

		return;



	spin_lock_irqsave(&common->lock, flags);



	rcar_thermal_common_bset(common, INTMSK, mask, enable ? 0 : mask);
@@ -374,7 +377,6 @@ static int rcar_thermal_remove(struct platform_device *pdev) 
	struct rcar_thermal_priv *priv;



	rcar_thermal_for_each_priv(priv, common) {

		if (rcar_has_irq_support(priv))

		rcar_thermal_irq_disable(priv);

		thermal_zone_device_unregister(priv->zone);

	}
@@ -461,7 +463,6 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
			goto error_unregister;

		}



		if (rcar_has_irq_support(priv))

		rcar_thermal_irq_enable(priv);



		list_move_tail(&priv->list, &common->head);