diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-12-15 01:17:56 +0000 |
|---|---|---|
| committer |   Eduardo Valentin <edubezval@gmail.com> | 2016-01-06 18:06:38 -0800 |
| commit | ffbcdf8a759c6dde71c6c4f646a552f7637bcca7 (patch) | |
| tree | bab124bea2f16dae4a300adeee307361fb6a90fa /drivers/thermal/rcar_thermal.c | |
| parent | thermal: rcar: check every rcar_thermal_update_temp() return value (diff) | |
| download | linux-dev-ffbcdf8a759c6dde71c6c4f646a552f7637bcca7.tar.xz linux-dev-ffbcdf8a759c6dde71c6c4f646a552f7637bcca7.zip | |
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal/rcar_thermal.c')
| -rw-r--r-- | drivers/thermal/rcar_thermal.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index b012d900c3f2..fb81fd7e6b81 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -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,8 +377,7 @@ 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); + rcar_thermal_irq_disable(priv); thermal_zone_device_unregister(priv->zone); } @@ -461,8 +463,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) goto error_unregister; } - if (rcar_has_irq_support(priv)) - rcar_thermal_irq_enable(priv); + rcar_thermal_irq_enable(priv); list_move_tail(&priv->list, &common->head); |