aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-07-24 17:18:27 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-06-22 23:54:37 -0700
commitf7f3651e0887f536a6854dfcae0c21fc5463b733 (patch)
tree07707e68753b87ac00a59b1b6d0de35fbaa388c9 /drivers/input
parentLinux 5.1 (diff)
downloadlinux-dev-f7f3651e0887f536a6854dfcae0c21fc5463b733.tar.xz
linux-dev-f7f3651e0887f536a6854dfcae0c21fc5463b733.zip
Input: iforce - remove "being used" silliness
The kernel is supposed to handle multiple devices, static flags in packet handling code will never work. Tested-by: Tim Schumacher <timschumi@gmx.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/joystick/iforce/iforce-packets.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index c10169f4554e..91893c751524 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -149,12 +149,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
{
struct input_dev *dev = iforce->dev;
int i;
- static int being_used = 0;
-
- if (being_used)
- dev_warn(&iforce->dev->dev,
- "re-entrant call to iforce_process %d\n", being_used);
- being_used++;
#ifdef CONFIG_JOYSTICK_IFORCE_232
if (HI(iforce->expect_packet) == HI(cmd)) {
@@ -165,10 +159,8 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
#endif
wake_up(&iforce->wait);
- if (!iforce->type) {
- being_used--;
+ if (!iforce->type)
return;
- }
switch (HI(cmd)) {
@@ -233,7 +225,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
}
break;
}
- being_used--;
}
int iforce_get_id_packet(struct iforce *iforce, char *packet)