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

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

can: c_can: fix unbalanced runtime PM disable in error path 



commit 257a2cd3eb578ee63d6bf90475dc4f4b16984139 upstream.

Runtime PM is enabled as one of the last steps of probe(), so all
earlier gotos to "exit_free_device" label were not correct and were
leading to unbalanced runtime PM disable depth.

Fixes: 6e2fe01dd6f9 ("can: c_can: move runtime PM enable/disable to c_can_platform")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://patch.msgid.link/20250112-syscon-phandle-args-can-v1-1-314d9549906f@linaro.org


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 039cc7d9

drivers/net/can/c_can/c_can_platform.c

+3 −2
Original line number Diff line number Diff line
@@ -391,15 +391,16 @@ static int c_can_plat_probe(struct platform_device *pdev) 
	if (ret) {

		dev_err(&pdev->dev, "registering %s failed (err=%d)\n",

			KBUILD_MODNAME, ret);

		goto exit_free_device;

		goto exit_pm_runtime;

	}



	dev_info(&pdev->dev, "%s device registered (regs=%p, irq=%d)\n",

		 KBUILD_MODNAME, priv->base, dev->irq);

	return 0;



exit_free_device:

exit_pm_runtime:

	pm_runtime_disable(priv->device);

exit_free_device:

	free_c_can_dev(dev);

exit:

	dev_err(&pdev->dev, "probe failed\n");