From: Davidlohr Bueso <dave@gnu.org>
To: Dmitry Torokhov <dtor@mail.ru>
Cc: LKML <linux-kernel@vger.kernel.org>,
"linux-serial@vger.kernel.org" <linux-serial@vger.kernel.org>
Subject: [PATCH] input: ct82710c: return proper error code for ct82c710_open
Date: Thu, 13 Jan 2011 14:35:50 -0300 [thread overview]
Message-ID: <1294940150.2200.4.camel@offworld> (raw)
From: Davidlohr Bueso <dave@gnu.org>
If request_irq() fails we should return the proper error instead of -1.
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
drivers/input/serio/ct82c710.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c
index 448c772..ee0edd0 100644
--- a/drivers/input/serio/ct82c710.c
+++ b/drivers/input/serio/ct82c710.c
@@ -111,9 +111,11 @@ static void ct82c710_close(struct serio *serio)
static int ct82c710_open(struct serio *serio)
{
unsigned char status;
+ int err = 0;
- if (request_irq(CT82C710_IRQ, ct82c710_interrupt, 0, "ct82c710", NULL))
- return -1;
+ err = request_irq(CT82C710_IRQ, ct82c710_interrupt, 0, "ct82c710", NULL);
+ if (err)
+ goto out;
status = inb_p(CT82C710_STATUS);
@@ -133,8 +135,8 @@ static int ct82c710_open(struct serio *serio)
free_irq(CT82C710_IRQ, NULL);
return -1;
}
-
- return 0;
+out:
+ return err;
}
/*
--
1.7.1
next reply other threads:[~2011-01-13 17:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-13 17:35 Davidlohr Bueso [this message]
2011-01-17 8:22 ` [PATCH] input: ct82710c: return proper error code for ct82c710_open Dmitry Torokhov
2011-01-17 12:43 ` Davidlohr Bueso
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=1294940150.2200.4.camel@offworld \
--to=dave@gnu.org \
--cc=dtor@mail.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@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;
as well as URLs for NNTP newsgroup(s).