summaryrefslogtreecommitdiff
path: root/drivers/input/mouse/olpc.h
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@debian.org>2007-03-02 15:19:09 -0500
committerAndres Salomon <dilinger@debian.org>2007-03-02 15:19:09 -0500
commit2dbe59e365c2a5ca404f40be6e2b1171ea4b6a3a (patch)
tree4b6671e371da067d8e94fdf27ecfb2e159a48ada /drivers/input/mouse/olpc.h
parent6ba3c9b2c4e5330195724cb9f271fb788575c355 (diff)
downloadlwn-2dbe59e365c2a5ca404f40be6e2b1171ea4b6a3a.tar.gz
lwn-2dbe59e365c2a5ca404f40be6e2b1171ea4b6a3a.zip
psmouse: fix bug with touchpad getting stuck in PT mode
Original patch from Zephaniah; this readds code that somehow got lost that fixes a race in the touchpad mode switching. If we quickly switch from GS to PT, and then back to GS, we can get stuck in PT mode. In order to protect against that, we delay the mode switch by 50ms and allow a subsequent packet to kill the mode switch. Signed-off-by: Andres Salomon <dilinger@debian.org>
Diffstat (limited to 'drivers/input/mouse/olpc.h')
-rw-r--r--drivers/input/mouse/olpc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/olpc.h b/drivers/input/mouse/olpc.h
index 6c88de4b12cf..74c2e4111ba6 100644
--- a/drivers/input/mouse/olpc.h
+++ b/drivers/input/mouse/olpc.h
@@ -32,7 +32,7 @@ struct olpc_data {
int pending_mode;
int current_mode;
s64 late;
- struct work_struct mode_switch;
+ struct delayed_work mode_switch;
};