From 9381758466f9939d84f6f70097c8883da9639379 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Fri, 3 Aug 2018 15:23:40 -0700 Subject: Input: iforce - move command completion handling to serio code Continue teasing apart protocol-specific bits from core into transport modules. This time move RS232-specific command completion handling from core to iforce-serio module. Tested-by: Tim Schumacher Signed-off-by: Dmitry Torokhov --- drivers/input/joystick/iforce/iforce-serio.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'drivers/input/joystick/iforce/iforce-serio.c') diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c index fa45ce425d47..eca2f6eca7f0 100644 --- a/drivers/input/joystick/iforce/iforce-serio.c +++ b/drivers/input/joystick/iforce/iforce-serio.c @@ -130,7 +130,17 @@ static irqreturn_t iforce_serio_irq(struct serio *serio, } if (iforce->idx == iforce->len) { - iforce_process_packet(iforce, (iforce->id << 8) | iforce->idx, iforce->data); + u16 cmd = (iforce->id << 8) | iforce->idx; + + /* Handle command completion */ + if (HI(iforce->expect_packet) == HI(cmd)) { + iforce->expect_packet = 0; + iforce->ecmd = cmd; + memcpy(iforce->edata, iforce->data, IFORCE_MAX_LENGTH); + } + + iforce_process_packet(iforce, cmd, iforce->data); + iforce->pkt = 0; iforce->id = 0; iforce->len = 0; -- cgit v1.2.3-59-g8ed1b