Commit cf96d977 authored by Wang Hai's avatar Wang Hai Committed by David S. Miller
Browse files

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: 4d5ae32f ("net: ethernet: Add a driver for Gemini gigabit ethernet")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9553b62c

drivers/net/ethernet/cortina/gemini.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}