From: "Oskar Schirmer" <os@emlix.com>
To: Sascha Hauer <kernel@pengutronix.de>
Cc: linux-kernel@vger.kernel.org, "Daniel Glöckner" <dg@emlix.com>,
"Oskar Schirmer" <os@emlix.com>
Subject: [PATCH 5/8] imx: serial: handle initialisation failure correctly
Date: Tue, 9 Jun 2009 15:46:48 +0200 [thread overview]
Message-ID: <1244555211-15618-6-git-send-email-os@emlix.com> (raw)
In-Reply-To: <1244555211-15618-5-git-send-email-os@emlix.com>
From: Daniel Glöckner <dg@emlix.com>
correctly de-initialise device when setting up failed,
call to pdata->exit() was missing.
Signed-off-by: Daniel Glöckner <dg@emlix.com>
Signed-off-by: Oskar Schirmer <os@emlix.com>
---
drivers/serial/imx.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 3fa07a9..60892a2 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1155,10 +1155,15 @@ static int serial_imx_probe(struct platform_device *pdev)
goto clkput;
}
- uart_add_one_port(&imx_reg, &sport->port);
+ ret = uart_add_one_port(&imx_reg, &sport->port);
+ if (ret)
+ goto deinit;
platform_set_drvdata(pdev, &sport->port);
return 0;
+deinit:
+ if (pdata->exit)
+ pdata->exit(pdev);
clkput:
clk_put(sport->clk);
clk_disable(sport->clk);
--
1.5.3.7
next prev parent reply other threads:[~2009-06-09 13:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 13:46 imx: serial: add IrDA support to serial driver Oskar Schirmer
2009-06-09 13:46 ` [PATCH 1/8] imx: serial: fix whitespaces (no changes in functionality) Oskar Schirmer
2009-06-09 13:46 ` [PATCH 2/8] imx: serial: fix one bit field type Oskar Schirmer
2009-06-09 13:46 ` [PATCH 3/8] imx: serial: notify higher layers in case xmit IRQ was not called Oskar Schirmer
2009-06-09 13:46 ` [PATCH 4/8] imx: serial: be sure to stop xmit upon shutdown Oskar Schirmer
2009-06-09 13:46 ` Oskar Schirmer [this message]
2009-06-09 13:46 ` [PATCH 6/8] lib: isolate rational fractions helper function Oskar Schirmer
2009-06-09 13:46 ` [PATCH 7/8] imx: serial: use rational library function Oskar Schirmer
2009-06-09 13:46 ` [PATCH 8/8] imx: serial: add IrDA support to serial driver Oskar Schirmer
2009-06-09 15:01 ` Alan Cox
2009-06-09 16:18 ` Oskar Schirmer
2009-06-09 17:07 ` Alan Cox
2009-06-09 18:04 ` Oskar Schirmer
2009-06-09 18:10 ` Sascha Hauer
2009-06-10 7:00 ` Oskar Schirmer
2009-06-09 18:13 ` [PATCH 6/8] lib: isolate rational fractions helper function Sascha Hauer
2009-06-09 18:29 ` imx: serial: add IrDA support to serial driver Sascha Hauer
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=1244555211-15618-6-git-send-email-os@emlix.com \
--to=os@emlix.com \
--cc=dg@emlix.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®