net: mscc: ocelot: Fix a resource leak in the error handling path of the probe function (f87675b8) · Commits · 戴 / test

In case of error after calling 'ocelot_init()', it must be undone by a corresponding 'ocelot_deinit()' call, as already done in the remove function. Fixes: ("net: mscc: Add initial Ocelot switch support") Signed-off-by:

Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by:

Alexandre Belloni <alexandre.belloni@bootlin.com> Link: https://lore.kernel.org/r/20201213114838.126922-1-christophe.jaillet@wanadoo.fr Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

drivers/net/ethernet/mscc/ocelot_vsc7514.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1267,7 +1267,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)

		err = mscc_ocelot_init_ports(pdev, ports);
		if (err)
		goto out_put_ports;
		goto out_ocelot_deinit;

		if (ocelot->ptp) {
		err = ocelot_init_timestamp(ocelot, &ocelot_ptp_clock_info);
		@@ -1282,8 +1282,14 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
		register_switchdev_notifier(&ocelot_switchdev_nb);
		register_switchdev_blocking_notifier(&ocelot_switchdev_blocking_nb);

		of_node_put(ports);

		dev_info(&pdev->dev, "Ocelot switch probed\n");

		return 0;

		out_ocelot_deinit:
		ocelot_deinit(ocelot);
		out_put_ports:
		of_node_put(ports);
		return err;

Admin message