net: mvneta: Fix err code path of probe
Subsystems (3)
PATCH 1/1 net: mvneta: Fix err code path of probe
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 dc35a10f68d3 ("net: mvneta: bm: add support for hardware buffer management")
Signed-off-by Jisheng Zhang <[email protected]>
--- drivers/net/ethernet/marvell/mvneta.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/marvell/mvneta.c +1 -3
@@ -4674,7 +4674,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,
@@ -4685,14 +4685,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);
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Jisheng Zhang <[email protected]>
Date: Mon, 27 May 2019 11:04:17 +0000
Quoted 8 lines
Fix below issues in err code path of probe:
1. we don't need tounregister_netdev()because the netdev isn't registered.
2. whenregister_netdev()fails, we also need to destroy bm pool for HWBM case.Fixes dc35a10f68d3 ("net: mvneta: bm: add support for hardware buffer management")Signed-off-by Jisheng Zhang <[email protected]>
Applied and queued up for -stable.