input: ct82710c: return proper error code for ct82c710_open

PATCH In review Davidlohr Bueso 2 participants 3 messages Jan 13, 2011 – Jan 17, 2011

Subsystems (2)

TTY layer and serial drivers Input drivers

lore

Share & tools

lore

Davidlohr Bueso

author

2011-01-13 17:36 UTC #0 lore raw

PATCH 1/1 input: ct82710c: return proper error code for ct82c710_open

From: Davidlohr Bueso <[email protected]>

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

Signed-off-by Davidlohr Bueso <[email protected]>

---
 drivers/input/serio/ct82c710.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

drivers/input/serio/ct82c710.c +6 -4

index 448c772..ee0edd0 100644
@@ -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;
 }
 
 /*

Signature · 1 line

1.7.1

Dmitry Torokhov

maintainer

2011-01-17 08:30 UTC #1 lore raw

Quoted 5 lines · Davidlohr Bueso

From: Davidlohr Bueso <[email protected]>
If request_irq() fails we should return the proper error instead of -1.
Signed-off-by Davidlohr Bueso <[email protected]>

Will apply, thank you. You don't really have the device, do you?

Thanks.

Signature · 1 line

Dmitry

Davidlohr Bueso

author

2011-01-17 14:53 UTC #2 lore raw

Quoted 9 lines · Dmitry Torokhov

Quoted 5 lines · Davidlohr Bueso
From: Davidlohr Bueso <[email protected]>
If request_irq() fails we should return the proper error instead of -1.
Signed-off-by Davidlohr Bueso <[email protected]>
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.

Quoted 2 lines

Thanks.