[PATCH] input: ct82710c: return proper error code for ct82c710_open

Subsystems: input (keyboard, mouse, joystick, touchscreen) drivers, the rest

STALE5744d

3 messages, 2 authors, 2011-01-17 · open the first message on its own page

[PATCH] input: ct82710c: return proper error code for ct82c710_open

From: Davidlohr Bueso <hidden>
Date: 2011-01-13 17:36:41

From: Davidlohr Bueso <redacted>

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

Signed-off-by: Davidlohr Bueso <redacted>
---
 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


Re: [PATCH] input: ct82710c: return proper error code for ct82c710_open

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2011-01-17 08:30:27

On Thu, Jan 13, 2011 at 02:35:50PM -0300, Davidlohr Bueso wrote:
From: Davidlohr Bueso <redacted>

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

Signed-off-by: Davidlohr Bueso <redacted>
Will apply, thank you. You don't really have the device, do you?

Thanks.

-- 
Dmitry

Re: [PATCH] input: ct82710c: return proper error code for ct82c710_open

From: Davidlohr Bueso <hidden>
Date: 2011-01-17 14:53:47

On Mon, 2011-01-17 at 00:22 -0800, Dmitry Torokhov wrote:
On Thu, Jan 13, 2011 at 02:35:50PM -0300, Davidlohr Bueso wrote:
quoted
From: Davidlohr Bueso <redacted>

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

Signed-off-by: Davidlohr Bueso <redacted>
Will apply, thank you. You don't really have the device, do you?
No, I don't have that device, but looks trivial enough to be
compile-tested only.

Thanks.
Thanks.

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help