linux-kernel - [PATCH] input: ct82710c: return proper error code for ct82c710

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1294940150.2200.4.camel@offworld>
Date:	Thu, 13 Jan 2011 14:35:50 -0300
From:	Davidlohr Bueso <dave@....org>
To:	Dmitry Torokhov <dtor@...l.ru>
Cc:	LKML <linux-kernel@...r.kernel.org>,
	"linux-serial@...r.kernel.org" <linux-serial@...r.kernel.org>
Subject: [PATCH] input: ct82710c: return proper error code for ct82c710_open

From: Davidlohr Bueso <dave@....org>

If request_irq() fails we should return the proper error instead of -1.

Signed-off-by: Davidlohr Bueso <dave@....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



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/