summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorJiada Wang <jiada_wang@mentor.com>2019-04-24 14:11:45 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-15 11:54:02 +0200
commitfd77a5117721d5c8da427f0767c016a326e2bd04 (patch)
treef6c99d00560a85a4394eba80d683a342c2e2d840 /drivers/thermal
parentc50c4fb0cb62cbacfe45694f99f2de09b86d62df (diff)
downloadlinux-stable-fd77a5117721d5c8da427f0767c016a326e2bd04.tar.gz
linux-stable-fd77a5117721d5c8da427f0767c016a326e2bd04.tar.bz2
linux-stable-fd77a5117721d5c8da427f0767c016a326e2bd04.zip
thermal: rcar_gen3_thermal: disable interrupt in .remove
[ Upstream commit 63f55fcea50c25ae5ad45af92d08dae3b84534c2 ] Currently IRQ remains enabled after .remove, later if device is probed, IRQ is requested before .thermal_init, this may cause IRQ function be called before device is initialized. this patch disables interrupt in .remove, to ensure irq function only be called after device is fully initialized. Signed-off-by: Jiada Wang <jiada_wang@mentor.com> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/rcar_gen3_thermal.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
index 7aed5337bdd3..704c8ad045bb 100644
--- a/drivers/thermal/rcar_gen3_thermal.c
+++ b/drivers/thermal/rcar_gen3_thermal.c
@@ -328,6 +328,9 @@ MODULE_DEVICE_TABLE(of, rcar_gen3_thermal_dt_ids);
static int rcar_gen3_thermal_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
+ struct rcar_gen3_thermal_priv *priv = dev_get_drvdata(dev);
+
+ rcar_thermal_irq_set(priv, false);
pm_runtime_put(dev);
pm_runtime_disable(dev);