From: Chunyan Zhang <zhang.lyra@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
Orson Zhai <orsonzhai@gmail.com>,
Baolin Wang <baolin.wang7@gmail.com>,
Chunyan Zhang <zhang.lyra@gmail.com>,
Chunyan Zhang <chunyan.zhang@unisoc.com>
Subject: [PATCH 3/3] serial: sprd: cleanup the sprd_port when return -EPROBE_DEFER
Date: Mon, 16 Mar 2020 18:19:30 +0800 [thread overview]
Message-ID: <20200316101930.9962-4-zhang.lyra@gmail.com> (raw)
In-Reply-To: <20200316101930.9962-1-zhang.lyra@gmail.com>
From: Chunyan Zhang <chunyan.zhang@unisoc.com>
cleanup the sprd_port for the device when its .probe() would be called
later, and then alloc memory for its sprd_port again.
Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
---
drivers/tty/serial/sprd_serial.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c
index 914862844790..9917d7240172 100644
--- a/drivers/tty/serial/sprd_serial.c
+++ b/drivers/tty/serial/sprd_serial.c
@@ -1230,8 +1230,13 @@ static int sprd_probe(struct platform_device *pdev)
up->has_sysrq = IS_ENABLED(CONFIG_SERIAL_SPRD_CONSOLE);
ret = sprd_clk_init(up);
- if (ret)
+ if (ret) {
+ if (ret == -EPROBE_DEFER) {
+ devm_kfree(&pdev->dev, sprd_port[index]);
+ sprd_port[index] = NULL;
+ }
return ret;
+ }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
up->membase = devm_ioremap_resource(&pdev->dev, res);
--
2.20.1
next prev parent reply other threads:[~2020-03-16 10:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 10:19 [PATCH 0/3] a few fixes for sprd serial driver Chunyan Zhang
2020-03-16 10:19 ` [PATCH 1/3] serial: sprd: check console via stdout-path in addition Chunyan Zhang
2020-03-17 6:10 ` Baolin Wang
2020-03-16 10:19 ` [PATCH 2/3] serial: sprd: remove __init from sprd_console_setup Chunyan Zhang
2020-03-17 6:11 ` Baolin Wang
2020-03-16 10:19 ` Chunyan Zhang [this message]
2020-03-17 6:21 ` [PATCH 3/3] serial: sprd: cleanup the sprd_port when return -EPROBE_DEFER Baolin Wang
2020-03-17 7:18 ` Chunyan Zhang
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=20200316101930.9962-4-zhang.lyra@gmail.com \
--to=zhang.lyra@gmail.com \
--cc=baolin.wang7@gmail.com \
--cc=chunyan.zhang@unisoc.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=orsonzhai@gmail.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;
as well as URLs for NNTP newsgroup(s).