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

Commit 8c85770d authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Greg Kroah-Hartman
Browse files

net: liquidio: release resources when liquidio driver open failed 



[ Upstream commit 8979f428a4afc215e390006e5ea19fd4e22c7ca9 ]

When liquidio driver open failed, it doesn't release resources. Compile
tested only.

Fixes: 5b07aee1 ("liquidio: MSIX support for CN23XX")
Fixes: dbc97bfd3918 ("net: liquidio: Add missing null pointer checks")
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0f2c6819

drivers/net/ethernet/cavium/liquidio/lio_main.c

+26 −8
Original line number Diff line number Diff line
@@ -1836,13 +1836,10 @@ static int liquidio_open(struct net_device *netdev) 


	ifstate_set(lio, LIO_IFSTATE_RUNNING);



	if (OCTEON_CN23XX_PF(oct)) {

		if (!oct->msix_on)

			if (setup_tx_poll_fn(netdev))

				return -1;

	} else {

		if (setup_tx_poll_fn(netdev))

			return -1;

	if (!OCTEON_CN23XX_PF(oct) || (OCTEON_CN23XX_PF(oct) && !oct->msix_on)) {

		ret = setup_tx_poll_fn(netdev);

		if (ret)

			goto err_poll;

	}



	netif_tx_start_all_queues(netdev);
@@ -1855,7 +1852,7 @@ static int liquidio_open(struct net_device *netdev) 
	/* tell Octeon to start forwarding packets to host */

	ret = send_rx_ctrl_cmd(lio, 1);

	if (ret)

		return ret;

		goto err_rx_ctrl;



	/* start periodical statistics fetch */

	INIT_DELAYED_WORK(&lio->stats_wk.work, lio_fetch_stats);
@@ -1866,6 +1863,27 @@ static int liquidio_open(struct net_device *netdev) 
	dev_info(&oct->pci_dev->dev, "%s interface is opened\n",

		 netdev->name);



	return 0;



err_rx_ctrl:

	if (!OCTEON_CN23XX_PF(oct) || (OCTEON_CN23XX_PF(oct) && !oct->msix_on))

		cleanup_tx_poll_fn(netdev);

err_poll:

	if (lio->ptp_clock) {

		ptp_clock_unregister(lio->ptp_clock);

		lio->ptp_clock = NULL;

	}



	if (oct->props[lio->ifidx].napi_enabled == 1) {

		list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list)

			napi_disable(napi);



		oct->props[lio->ifidx].napi_enabled = 0;



		if (OCTEON_CN23XX_PF(oct))

			oct->droq[0]->ops.poll_mode = 0;

	}



	return ret;

}