UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

thermal: rcar: Make error and remove paths symmetrical with init 

Swap interrupt disable and thermal zone unregistration in the error and
remove paths, to make them more symmetrical with the initialization
path.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Geert Uytterhoeven 2015-02-23 16:37:25 +01:00 committed by Eduardo Valentin
parent 0b37a83a91
commit ac71c7025e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/thermal/rcar_thermal.c
View File

@ -463,9 +463,9 @@ static int rcar_thermal_probe(struct platform_device *pdev)
error_unregister: error_unregister:
rcar_thermal_for_each_priv(priv, common) { rcar_thermal_for_each_priv(priv, common) {
thermal_zone_device_unregister(priv->zone);
if (rcar_has_irq_support(priv)) if (rcar_has_irq_support(priv))
rcar_thermal_irq_disable(priv); rcar_thermal_irq_disable(priv);
thermal_zone_device_unregister(priv->zone);
} }
pm_runtime_put(dev); pm_runtime_put(dev);
@ -481,9 +481,9 @@ static int rcar_thermal_remove(struct platform_device *pdev)
struct rcar_thermal_priv *priv; struct rcar_thermal_priv *priv;
rcar_thermal_for_each_priv(priv, common) { rcar_thermal_for_each_priv(priv, common) {
thermal_zone_device_unregister(priv->zone);
if (rcar_has_irq_support(priv)) if (rcar_has_irq_support(priv))
rcar_thermal_irq_disable(priv); rcar_thermal_irq_disable(priv);
thermal_zone_device_unregister(priv->zone);
} }
pm_runtime_put(dev); pm_runtime_put(dev);