diff options
| author | Dmitry Torokhov | 2018-08-10 19:21:13 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2019-06-23 08:55:22 +0200 |
| commit | 2880dcf9cfc28a3803aee4c964743adbb66b0f1a (patch) | |
| tree | 7a226c1fdf2e92b52d3ea374926cb6d275c28fca | |
| parent | Input: iforce - do not combine arguments for iforce_process_packet() (diff) | |
| download | kernel-qcow2-linux-2880dcf9cfc28a3803aee4c964743adbb66b0f1a.tar.gz kernel-qcow2-linux-2880dcf9cfc28a3803aee4c964743adbb66b0f1a.tar.xz kernel-qcow2-linux-2880dcf9cfc28a3803aee4c964743adbb66b0f1a.zip | |
Input: iforce - signal command completion from transport code
Signalling command completion from iforce_process_packet() does
not make sense, as not all transport use the same data path for
both commands and motion data form the device, that is why USB
code already has to signal command completion iforce_usb_out().
Let's move signalling completion into individual transport
modules.
Tested-by: Tim Schumacher <timschumi@gmx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-packets.c | 2 | ||||
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-serio.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c index 35b7a5206977..c0a665961c23 100644 --- a/drivers/input/joystick/iforce/iforce-packets.c +++ b/drivers/input/joystick/iforce/iforce-packets.c @@ -172,8 +172,6 @@ void iforce_process_packet(struct iforce *iforce, struct input_dev *dev = iforce->dev; int i, j; - wake_up(&iforce->wait); - if (!iforce->type) return; diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c index f8bf7d2aa59f..0dd95d145e85 100644 --- a/drivers/input/joystick/iforce/iforce-serio.c +++ b/drivers/input/joystick/iforce/iforce-serio.c @@ -169,10 +169,13 @@ static irqreturn_t iforce_serio_irq(struct serio *serio, iforce->ecmd = (iforce_serio->id << 8) | iforce_serio->idx; memcpy(iforce->edata, iforce->data, IFORCE_MAX_LENGTH); - } - iforce_process_packet(iforce, iforce_serio->id, - iforce->data, iforce_serio->len); + /* Signal that command is done */ + wake_up(&iforce->wait); + } else { + iforce_process_packet(iforce, iforce_serio->id, + iforce->data, iforce_serio->len); + } iforce_serio->pkt = 0; iforce_serio->id = 0; |