summaryrefslogtreecommitdiff
path: root/drivers/input/joystick/iforce/iforce-serio.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-08-09 17:50:39 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-06-22 23:55:22 -0700
commitd3cc100069f945a392d6cde5ea326bb686418193 (patch)
treed791ffe72a6b45becb6dd47c6748d32c7b9b73a1 /drivers/input/joystick/iforce/iforce-serio.c
parent8a25e05890f155406171e8cb256177275bbf387f (diff)
Input: iforce - do not combine arguments for iforce_process_packet()
Current code combines packet type and data length into single argument to iforce_process_packet() and then has to untangle it. It is much clearer to simply use separate arguments. Tested-by: Tim Schumacher <timschumi@gmx.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick/iforce/iforce-serio.c')
-rw-r--r--drivers/input/joystick/iforce/iforce-serio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c
index 6c6411fbdc32..f8bf7d2aa59f 100644
--- a/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -163,16 +163,16 @@ static irqreturn_t iforce_serio_irq(struct serio *serio,
}
if (iforce_serio->idx == iforce_serio->len) {
- u16 cmd = (iforce_serio->id << 8) | iforce_serio->idx;
-
/* Handle command completion */
if (iforce_serio->expect_packet == iforce_serio->id) {
iforce_serio->expect_packet = 0;
- iforce->ecmd = cmd;
+ iforce->ecmd = (iforce_serio->id << 8) |
+ iforce_serio->idx;
memcpy(iforce->edata, iforce->data, IFORCE_MAX_LENGTH);
}
- iforce_process_packet(iforce, cmd, iforce->data);
+ iforce_process_packet(iforce, iforce_serio->id,
+ iforce->data, iforce_serio->len);
iforce_serio->pkt = 0;
iforce_serio->id = 0;