From: Mao Wenan <maowenan@huawei.com>
To: <jacmet@sunsite.dk>, <gregkh@linuxfoundation.org>,
<jslaby@suse.com>, <shubhrajyoti.datta@xilinx.com>
Cc: <linux-serial@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<kernel-janitors@vger.kernel.org>,
Mao Wenan <maowenan@huawei.com>
Subject: [PATCH -next] serial: uartlite: Missing uart_unregister_driver() on error in ulite_probe()
Date: Fri, 1 Nov 2019 19:19:50 +0800 [thread overview]
Message-ID: <20191101111950.47817-1-maowenan@huawei.com> (raw)
If uart_register_driver(&ulite_uart_driver) is success,
but followed function is failed in ulite_probe, it needs to call
uart_unregister_driver to unregister.
Fixes: f33cf776617b ("serial-uartlite: Move the uart register")
Signed-off-by: Mao Wenan <maowenan@huawei.com>
---
drivers/tty/serial/uartlite.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 06e79c1..2edae76 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -813,21 +813,29 @@ static int ulite_probe(struct platform_device *pdev)
pdata = devm_kzalloc(&pdev->dev, sizeof(struct uartlite_data),
GFP_KERNEL);
- if (!pdata)
+ if (!pdata) {
+ uart_unregister_driver(&ulite_uart_driver);
return -ENOMEM;
+ }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
+ if (!res) {
+ uart_unregister_driver(&ulite_uart_driver);
return -ENODEV;
+ }
irq = platform_get_irq(pdev, 0);
- if (irq <= 0)
+ if (irq <= 0) {
+ uart_unregister_driver(&ulite_uart_driver);
return -ENXIO;
+ }
pdata->clk = devm_clk_get(&pdev->dev, "s_axi_aclk");
if (IS_ERR(pdata->clk)) {
- if (PTR_ERR(pdata->clk) != -ENOENT)
+ if (PTR_ERR(pdata->clk) != -ENOENT) {
+ uart_unregister_driver(&ulite_uart_driver);
return PTR_ERR(pdata->clk);
+ }
/*
* Clock framework support is optional, continue on
@@ -840,6 +848,7 @@ static int ulite_probe(struct platform_device *pdev)
ret = clk_prepare_enable(pdata->clk);
if (ret) {
dev_err(&pdev->dev, "Failed to prepare clock\n");
+ uart_unregister_driver(&ulite_uart_driver);
return ret;
}
--
2.7.4
next reply other threads:[~2019-11-01 11:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 11:19 Mao Wenan [this message]
2019-11-01 11:41 ` Johan Hovold
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=20191101111950.47817-1-maowenan@huawei.com \
--to=maowenan@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=jacmet@sunsite.dk \
--cc=jslaby@suse.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=shubhrajyoti.datta@xilinx.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®