aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Changzhong <[email protected]>2022-11-14 16:14:44 +0800
committerMarc Kleine-Budde <[email protected]>2022-11-24 16:10:04 +0100
commit709cb2f9ed2006eb1dc4b36b99d601cd24889ec4 (patch)
treebc6b9432c3c3660f6ab71878dc6da98970f63406
parent62ec89e74099a3d6995988ed9f2f996b368417ec (diff)
can: etas_es58x: es58x_init_netdev(): free netdev when register_candev()
In case of register_candev() fails, clear es58x_dev->netdev[channel_idx] and add free_candev(). Otherwise es58x_free_netdevs() will unregister the netdev that has never been registered. Fixes: 8537257874e9 ("can: etas_es58x: add core support for ETAS ES58X CAN USB interfaces") Signed-off-by: Zhang Changzhong <[email protected]> Acked-by: Arunachalam Santhanam <[email protected]> Acked-by: Vincent Mailhol <[email protected]> Link: https://lore.kernel.org/all/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
-rw-r--r--drivers/net/can/usb/etas_es58x/es58x_core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.c b/drivers/net/can/usb/etas_es58x/es58x_core.c
index 25f863b4f5f0..ddb7c5735c9a 100644
--- a/drivers/net/can/usb/etas_es58x/es58x_core.c
+++ b/drivers/net/can/usb/etas_es58x/es58x_core.c
@@ -2091,8 +2091,11 @@ static int es58x_init_netdev(struct es58x_device *es58x_dev, int channel_idx)
netdev->dev_port = channel_idx;
ret = register_candev(netdev);
- if (ret)
+ if (ret) {
+ es58x_dev->netdev[channel_idx] = NULL;
+ free_candev(netdev);
return ret;
+ }
netdev_queue_set_dql_min_limit(netdev_get_tx_queue(netdev, 0),
es58x_dev->param->dql_min_limit);