diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-02 23:27:49 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-02 23:27:49 -0500 |
| commit | f4e3c711b31cea401b03ce39d4b5f1a30279094c (patch) | |
| tree | a86a801533d962e5773d9c9e4d42d6793e54acf9 /drivers/input | |
| parent | b1b2965057700d6dc9e1f986e8f7743b95ead424 (diff) | |
| download | op-kernel-dev-f4e3c711b31cea401b03ce39d4b5f1a30279094c.zip op-kernel-dev-f4e3c711b31cea401b03ce39d4b5f1a30279094c.tar.gz | |
Input: i8042 - remove unneeded call to i8042_interrupt()
Remove call to i8042_interrupt() from i8042_aux_write(). According
to Vojtech it may cause problems with older controllers if it is
called right after real interrupt. Also it is not needed anymore
since we register IRQs early and not waiting for serio ports to
be opened.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/i8042.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 7e3141f..d365f22 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -255,25 +255,10 @@ static int i8042_kbd_write(struct serio *port, unsigned char c) static int i8042_aux_write(struct serio *serio, unsigned char c) { struct i8042_port *port = serio->port_data; - int retval; - -/* - * Send the byte out. - */ - - if (port->mux == -1) - retval = i8042_command(&c, I8042_CMD_AUX_SEND); - else - retval = i8042_command(&c, I8042_CMD_MUX_SEND + port->mux); -/* - * Make sure the interrupt happens and the character is received even - * in the case the IRQ isn't wired, so that we can receive further - * characters later. - */ - - i8042_interrupt(0, NULL); - return retval; + return i8042_command(&c, port->mux == -1 ? + I8042_CMD_AUX_SEND : + I8042_CMD_MUX_SEND + port->mux); } /* |
