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

Commit e8384bef authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

reset: berlin: fix OF node leak in probe() error path 



[ Upstream commit 5f58a88cc91075be38cec69b7cb70aaa4ba69e8b ]

Driver is leaking OF node reference on memory allocation failure.
Acquire the OF node reference after memory allocation to fix this and
keep it simple.

Fixes: aed6f3ca ("reset: berlin: convert to a platform driver")
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240825-reset-cleanup-scoped-v1-1-03f6d834f8c0@linaro.org


Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1f578d21

drivers/reset/reset-berlin.c

+2 −1
Original line number Diff line number Diff line
@@ -68,13 +68,14 @@ static int berlin_reset_xlate(struct reset_controller_dev *rcdev, 


static int berlin2_reset_probe(struct platform_device *pdev)

{

	struct device_node *parent_np = of_get_parent(pdev->dev.of_node);

	struct device_node *parent_np;

	struct berlin_reset_priv *priv;



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	parent_np = of_get_parent(pdev->dev.of_node);

	priv->regmap = syscon_node_to_regmap(parent_np);

	of_node_put(parent_np);

	if (IS_ERR(priv->regmap))