net: gemini: Fix missing free_netdev() in error path of gemini_ethernet_port_probe()
PATCH v2 1/1 net: gemini: Fix missing free_netdev() in error path of gemini_ethernet_port_probe()
Replace alloc_etherdev_mq with devm_alloc_etherdev_mqs. In this way, when probe fails, netdev can be freed automatically.
Fixes 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet")
Reported-by Hulk Robot <[email protected]>
Signed-off-by Wang Hai <[email protected]>
---v1->v2: Make use of devm_alloc_etherdev_mqs() to simplify the code
drivers/net/ethernet/cortina/gemini.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/cortina/gemini.c +1 -3
@@ -2389,7 +2389,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)dev_info (dev,"probe %s ID %d\n" ,dev_name (dev), id); - netdev =alloc_etherdev_mq (sizeof (*port),TX_QUEUE_NUM ); + netdev =devm_alloc_etherdev_mqs (dev,sizeof (*port),TX_QUEUE_NUM ,TX_QUEUE_NUM );if (!netdev) {dev_err (dev,"Can't allocate ethernet device #%d\n" , id);return -ENOMEM ;
@@ -2521,7 +2521,6 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) } port->netdev =NULL ; -free_netdev (netdev);return ret; }
@@ -2530,7 +2529,6 @@ static int gemini_ethernet_port_remove(struct platform_device *pdev)struct gemini_ethernet_port *port =platform_get_drvdata (pdev);gemini_port_remove (port); -free_netdev (port->netdev);return 0 ; }
Signature · 1 line
2.17.1
From: Wang Hai <[email protected]>
Date: Wed, 19 Aug 2020 10:33:09 +0800
Quoted 8 lines
Replace
alloc_etherdev_mqwithdevm_alloc_etherdev_mqs. In this way, when probe fails, netdev can be freed automatically.Fixes 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet")Reported-by Hulk Robot <[email protected]>Signed-off-by Wang Hai <[email protected]>---
v1->v2: Make use ofdevm_alloc_etherdev_mqs()to simplify the code
Applied, thank you.