diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-06 04:25:13 +0100 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-06 04:25:13 +0100 |
commit | fed8bf19ec20efc0641740b2d10aa589dbd6d1ab (patch) | |
tree | c104a13c7b8cb7f4152b15729dc5aede7c063e91 /drivers/input/mouse | |
parent | Input: wistron - convert to the new platform device interface (diff) | |
parent | [NET]: Change 1500 to ETH_DATA_LEN in some files (diff) | |
download | linux-fed8bf19ec20efc0641740b2d10aa589dbd6d1ab.tar.xz linux-fed8bf19ec20efc0641740b2d10aa589dbd6d1ab.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r-- | drivers/input/mouse/sermouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c index 4bf584364d28..2f9a04ae725f 100644 --- a/drivers/input/mouse/sermouse.c +++ b/drivers/input/mouse/sermouse.c @@ -95,7 +95,7 @@ static void sermouse_process_msc(struct sermouse *sermouse, signed char data, st input_sync(dev); - if (++sermouse->count == (5 - ((sermouse->type == SERIO_SUN) << 1))) + if (++sermouse->count == 5) sermouse->count = 0; } |