From: Dongliang Mu <mudongliangabcd@gmail.com>
To: Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com>,
Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>,
Wolfgang Grandegger <wg@grandegger.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Michal Simek <michal.simek@xilinx.com>
Cc: Dongliang Mu <mudongliangabcd@gmail.com>,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] driver: net: can: delete napi if register_candev fails
Date: Wed, 13 Oct 2021 12:03:49 +0800 [thread overview]
Message-ID: <20211013040349.2858773-1-mudongliangabcd@gmail.com> (raw)
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
next reply other threads:[~2021-10-13 4:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 4:03 Dongliang Mu [this message]
2021-10-13 5:21 ` Dongliang Mu
2021-10-17 12:36 ` Marc Kleine-Budde
2021-10-17 12:52 ` Dongliang Mu
2021-10-17 20:16 ` Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211013040349.2858773-1-mudongliangabcd@gmail.com \
--to=mudongliangabcd@gmail.com \
--cc=appana.durga.rao@xilinx.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=mkl@pengutronix.de \
--cc=naga.sureshkumar.relli@xilinx.com \
--cc=netdev@vger.kernel.org \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®