From: Daeseok Youn <daeseok.youn@gmail.com>
To: lidza.louina@gmail.com, gregkh@linuxfoundation.org
Cc: markh@compro.net, driverdev-devel@linuxdriverproject.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] staging: dgap: implement proper error handling in dgap_firmware_load()
Date: Mon, 26 May 2014 19:23:47 +0900 [thread overview]
Message-ID: <20140526102347.GA13793@devel.8.8.4.4> (raw)
When dgap_tty_init() and dgap_tty_register_ports() are failed,
these are needed to free some memory properly.
It can be handled by calling dgap_tty_uninit() and dgap_cleanup_board().
But tty's ports are not registered yet when these function are failed,
so brd->nasync set to zero.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
---
drivers/staging/dgap/dgap.c | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 60b7d70..db24f70 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -954,19 +954,30 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type)
* Do tty device initialization.
*/
ret = dgap_tty_init(brd);
- if (ret < 0) {
- dgap_tty_uninit(brd);
- return ret;
- }
+ if (ret < 0)
+ goto err_cleanup;
ret = dgap_tty_register_ports(brd);
if (ret)
- return ret;
+ goto err_cleanup;
brd->state = BOARD_READY;
brd->dpastatus = BD_RUNNING;
return 0;
+
+err_cleanup:
+ /*
+ * Clear nasync to zero for avoiding to call
+ * some destroyer for tty's ports which are not
+ * registered yet in dgap_tty_uninit().
+ */
+ brd->nasync = 0;
+
+ dgap_tty_uninit(brd);
+ dgap_cleanup_board(brd);
+ return ret;
+
}
/*
--
1.7.1
next reply other threads:[~2014-05-26 10:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-26 10:23 Daeseok Youn [this message]
2014-05-26 10:50 ` [PATCH 2/4] staging: dgap: implement proper error handling in dgap_firmware_load() Dan Carpenter
2014-05-27 0:07 ` DaeSeok Youn
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=20140526102347.GA13793@devel.8.8.4.4 \
--to=daeseok.youn@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=lidza.louina@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=markh@compro.net \
/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