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

Commit 1dc20828 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Zhang Rui
Browse files

thermal: rcar: tidyup registration failure case 



Current rcar_thermal driver didn't care about rcar_theraml_irq_disable()
when registration failure case on _probe(), and _remove().
And, it returns without unregistering thermal zone when
registration failure case on _probe().
This patch fixes these issue.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent fa0d654c

drivers/thermal/rcar_thermal.c

+16 −7
Original line number Diff line number Diff line
@@ -419,12 +419,15 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
		priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

		if (!priv) {

			dev_err(dev, "Could not allocate priv\n");

			return -ENOMEM;

			ret = -ENOMEM;

			goto error_unregister;

		}



		priv->base = devm_ioremap_resource(dev, res);

		if (IS_ERR(priv->base))

			return PTR_ERR(priv->base);

		if (IS_ERR(priv->base)) {

			ret = PTR_ERR(priv->base);

			goto error_unregister;

		}



		priv->common = common;

		priv->id = i;
@@ -443,10 +446,10 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
			goto error_unregister;

		}



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



		if (rcar_has_irq_support(priv))

			rcar_thermal_irq_enable(priv);



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

	}



	platform_set_drvdata(pdev, common);
@@ -456,8 +459,11 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
	return 0;



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))

			rcar_thermal_irq_disable(priv);

	}



	return ret;

}
@@ -467,8 +473,11 @@ static int rcar_thermal_remove(struct platform_device *pdev) 
	struct rcar_thermal_common *common = platform_get_drvdata(pdev);

	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))

			rcar_thermal_irq_disable(priv);

	}



	platform_set_drvdata(pdev, NULL);