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

Commit de9d6a73 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Greg Kroah-Hartman
Browse files

net: mvneta: Fix err code path of probe 



[ Upstream commit d484e06e25ebb937d841dac02ac1fe76ec7d4ddd ]

Fix below issues in err code path of probe:
1. we don't need to unregister_netdev() because the netdev isn't
registered.
2. when register_netdev() fails, we also need to destroy bm pool for
HWBM case.

Fixes: dc35a10f ("net: mvneta: bm: add support for hardware buffer management")
Signed-off-by: default avatarJisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39fd0dc4

drivers/net/ethernet/marvell/mvneta.c

+1 −3
Original line number Diff line number Diff line
@@ -4611,7 +4611,7 @@ static int mvneta_probe(struct platform_device *pdev) 
	err = register_netdev(dev);

	if (err < 0) {

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

		goto err_free_stats;

		goto err_netdev;

	}



	netdev_info(dev, "Using %s mac address %pM\n", mac_from,
@@ -4622,14 +4622,12 @@ static int mvneta_probe(struct platform_device *pdev) 
	return 0;



err_netdev:

	unregister_netdev(dev);

	if (pp->bm_priv) {

		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_long, 1 << pp->id);

		mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_short,

				       1 << pp->id);

		mvneta_bm_put(pp->bm_priv);

	}

err_free_stats:

	free_percpu(pp->stats);

err_free_ports:

	free_percpu(pp->ports);