lkml.org 
[lkml]   [2021]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] driver: net: can: delete napi if register_candev fails
Date
If register_candev fails, xcan_probe does not clean the napi
created by netif_napi_add.

Fix this by adding error handling code to clean napi when
register_candev fails.

Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
---
drivers/net/can/xilinx_can.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 3b883e607d8b..6ee0b5a8cdfc 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -1807,7 +1807,7 @@ static int xcan_probe(struct platform_device *pdev)
ret = register_candev(ndev);
if (ret) {
dev_err(&pdev->dev, "fail to register failed (err=%d)\n", ret);
- goto err_disableclks;
+ goto err_del_napi;
}

devm_can_led_init(ndev);
@@ -1825,6 +1825,8 @@ static int xcan_probe(struct platform_device *pdev)

return 0;

+err_del_napi:
+ netif_napi_del(&priv->napi);
err_disableclks:
pm_runtime_put(priv->dev);
pm_runtime_disable(&pdev->dev);
--
2.25.1
\
 
 \ /
  Last update: 2021-10-13 06:05    [W:0.054 / U:0.448 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site