[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20211013040349.2858773-1-mudongliangabcd@gmail.com>
Date: Wed, 13 Oct 2021 12:03:49 +0800
From: Dongliang Mu <mudongliangabcd@...il.com>
To: Appana Durga Kedareswara rao <appana.durga.rao@...inx.com>,
Naga Sureshkumar Relli <naga.sureshkumar.relli@...inx.com>,
Wolfgang Grandegger <wg@...ndegger.com>,
Marc Kleine-Budde <mkl@...gutronix.de>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Michal Simek <michal.simek@...inx.com>
Cc: Dongliang Mu <mudongliangabcd@...il.com>,
linux-can@...r.kernel.org, netdev@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [PATCH] driver: net: can: delete napi if register_candev fails
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@...il.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
Powered by blists - more mailing lists