OSDN Git Service

can: etas_es58x: es58x_init_netdev(): free netdev when register_candev()
authorZhang Changzhong <zhangchangzhong@huawei.com>
Mon, 14 Nov 2022 08:14:44 +0000 (16:14 +0800)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 24 Nov 2022 15:10:04 +0000 (16:10 +0100)
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 <zhangchangzhong@huawei.com>
Acked-by: Arunachalam Santhanam <Arunachalam.Santhanam@in.bosch.com>
Acked-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/all/1668413685-23354-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/usb/etas_es58x/es58x_core.c

index 25f863b..ddb7c57 100644 (file)
@@ -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);