From: Jiri Slaby <jirislaby@kernel.org>
To: Chuhong Yuan <hslester96@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
NXP Linux Team <linux-imx@nxp.com>,
linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] serial: mxs-auart: add missed iounmap() in probe failure and remove
Date: Tue, 14 Jul 2020 13:29:11 +0200 [thread overview]
Message-ID: <8fcb4cd4-3a3a-5240-bce4-ef740a243856@kernel.org> (raw)
In-Reply-To: <20200709135608.68290-1-hslester96@gmail.com>
On 09. 07. 20, 15:56, Chuhong Yuan wrote:
> This driver calls ioremap() in probe, but it misses calling iounmap() in
> probe's error handler and remove.
> Add the missed calls to fix it.
>
> Fixes: 47d37d6f94cc ("serial: Add auart driver for i.MX23/28")
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> ---
> Changes in v2:
> - Use iounmap() instead of devm_ioremap() to fix the bugs.
Out of curiosity, what was wrong with devm_ioremap? I seem I cannot find
the reason...
> - Modify the subject and the description.
>
> drivers/tty/serial/mxs-auart.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
> index b4f835e7de23..b784323a6a7b 100644
> --- a/drivers/tty/serial/mxs-auart.c
> +++ b/drivers/tty/serial/mxs-auart.c
> @@ -1698,21 +1698,21 @@ static int mxs_auart_probe(struct platform_device *pdev)
> irq = platform_get_irq(pdev, 0);
> if (irq < 0) {
> ret = irq;
> - goto out_disable_clks;
> + goto out_iounmap;
> }
>
> s->port.irq = irq;
> ret = devm_request_irq(&pdev->dev, irq, mxs_auart_irq_handle, 0,
> dev_name(&pdev->dev), s);
> if (ret)
> - goto out_disable_clks;
> + goto out_iounmap;
>
> platform_set_drvdata(pdev, s);
>
> ret = mxs_auart_init_gpios(s, &pdev->dev);
> if (ret) {
> dev_err(&pdev->dev, "Failed to initialize GPIOs.\n");
> - goto out_disable_clks;
> + goto out_iounmap;
> }
>
> /*
> @@ -1720,7 +1720,7 @@ static int mxs_auart_probe(struct platform_device *pdev)
> */
> ret = mxs_auart_request_gpio_irq(s);
> if (ret)
> - goto out_disable_clks;
> + goto out_iounmap;
>
> auart_port[s->port.line] = s;
>
> @@ -1746,6 +1746,9 @@ static int mxs_auart_probe(struct platform_device *pdev)
> mxs_auart_free_gpio_irq(s);
> auart_port[pdev->id] = NULL;
>
> +out_iounmap:
> + iounmap(s->port.membase);
> +
> out_disable_clks:
> if (is_asm9260_auart(s)) {
> clk_disable_unprepare(s->clk);
> @@ -1761,6 +1764,7 @@ static int mxs_auart_remove(struct platform_device *pdev)
> uart_remove_one_port(&auart_driver, &s->port);
> auart_port[pdev->id] = NULL;
> mxs_auart_free_gpio_irq(s);
> + iounmap(s->port.membase);
> if (is_asm9260_auart(s)) {
> clk_disable_unprepare(s->clk);
> clk_disable_unprepare(s->clk_ahb);
>
--
js
suse labs
prev parent reply other threads:[~2020-07-14 11:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 13:56 [PATCH v2] serial: mxs-auart: add missed iounmap() in probe failure and remove Chuhong Yuan
2020-07-14 11:29 ` Jiri Slaby [this message]
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=8fcb4cd4-3a3a-5240-bce4-ef740a243856@kernel.org \
--to=jirislaby@kernel.org \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hslester96@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/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).