From: Timur Tabi <timur@codeaurora.org>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Shanker Donthineni <shankerd@codeaurora.org>,
awallis@codeaurora.org, abhimany@codeaurora.org,
will.deacon@arm.com, sboyd@codeaurora.org,
Vipul Gandhi <vgandhi@codeaurora.org>
Subject: [PATCH 2/3] hvc_dcc: don't ignore errors during initialization
Date: Fri, 26 Jun 2015 13:52:35 -0500 [thread overview]
Message-ID: <1435344756-20901-2-git-send-email-timur@codeaurora.org> (raw)
In-Reply-To: <1435344756-20901-1-git-send-email-timur@codeaurora.org>
hvc_instantiate() and hvc_alloc() return errors if they fail, so don't
ignore them.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
drivers/tty/hvc/hvc_dcc.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/hvc/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c
index 33657dc..f8b8cf2 100644
--- a/drivers/tty/hvc/hvc_dcc.c
+++ b/drivers/tty/hvc/hvc_dcc.c
@@ -225,20 +225,29 @@ static const struct hv_ops hvc_dcc_get_put_ops = {
static int __init hvc_dcc_console_init(void)
{
+ int ret;
+
+ /* This always runs on boot core */
if (!hvc_dcc_check())
return -ENODEV;
- hvc_instantiate(0, 0, &hvc_dcc_get_put_ops);
- return 0;
+ /* Returns -1 if error */
+ ret = hvc_instantiate(0, 0, &hvc_dcc_get_put_ops);
+
+ return ret < 0 ? -ENODEV : 0;
}
console_initcall(hvc_dcc_console_init);
static int __init hvc_dcc_init(void)
{
+ struct hvc_struct *p;
+
+ /* This can run on any core */
if (!hvc_dcc_check())
return -ENODEV;
- hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128);
- return 0;
+ p = hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128);
+
+ return IS_ERR(p) ? PTR_ERR(p) : 0;
}
device_initcall(hvc_dcc_init);
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2015-06-26 18:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-26 18:52 [PATCH 1/3] hvc_dcc: bind driver to core0 for reads and writes Timur Tabi
2015-06-26 18:52 ` Timur Tabi [this message]
2015-06-26 18:52 ` [PATCH 3/3] [v2] ARM64: TTY: hvc_dcc: Add support for ARM64 dcc Timur Tabi
2015-06-26 19:28 ` [PATCH 1/3] hvc_dcc: bind driver to core0 for reads and writes Timur Tabi
2015-06-30 13:58 ` Will Deacon
2015-06-30 14:07 ` Timur Tabi
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=1435344756-20901-2-git-send-email-timur@codeaurora.org \
--to=timur@codeaurora.org \
--cc=abhimany@codeaurora.org \
--cc=awallis@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sboyd@codeaurora.org \
--cc=shankerd@codeaurora.org \
--cc=vgandhi@codeaurora.org \
--cc=will.deacon@arm.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).