[PATCH] input: ct82710c: return proper error code for ct82c710_open
flat view
STALE5749d
From: Davidlohr Bueso <hidden>
Date: 2011-01-13 17:36:41
Also in:
lkml
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
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