diff options
Diffstat (limited to 'drivers/input/serio/i8042.c')
-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 7e3141f37e32..d365f227ac56 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) | |||
255 | static int i8042_aux_write(struct serio *serio, unsigned char c) | 255 | static int i8042_aux_write(struct serio *serio, unsigned char c) |
256 | { | 256 | { |
257 | struct i8042_port *port = serio->port_data; | 257 | struct i8042_port *port = serio->port_data; |
258 | int retval; | ||
259 | |||
260 | /* | ||
261 | * Send the byte out. | ||
262 | */ | ||
263 | |||
264 | if (port->mux == -1) | ||
265 | retval = i8042_command(&c, I8042_CMD_AUX_SEND); | ||
266 | else | ||
267 | retval = i8042_command(&c, I8042_CMD_MUX_SEND + port->mux); | ||
268 | 258 | ||
269 | /* | 259 | return i8042_command(&c, port->mux == -1 ? |
270 | * Make sure the interrupt happens and the character is received even | 260 | I8042_CMD_AUX_SEND : |
271 | * in the case the IRQ isn't wired, so that we can receive further | 261 | I8042_CMD_MUX_SEND + port->mux); |
272 | * characters later. | ||
273 | */ | ||
274 | |||
275 | i8042_interrupt(0, NULL); | ||
276 | return retval; | ||
277 | } | 262 | } |
278 | 263 | ||
279 | /* | 264 | /* |