summaryrefslogtreecommitdiff
path: root/Documentation/input
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-08-03 14:06:24 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-08-03 14:11:47 -0700
commit073e570d7c2caae9910a993d56f340be4548a4a8 (patch)
tree775f9a78720aea01fa83ea92d483597275a1437c /Documentation/input
parentb6e26546cc08e870da5413a3fcccc100eb2192c6 (diff)
Input: alps - only Dell laptops have separate button bits for v2 dualpoint sticks
It turns out that only Dell laptops have the separate button bits for v2 dualpoint sticks and that commit 92bac83dd79e ("Input: alps - non interleaved V2 dualpoint has separate stick button bits") causes regressions on Toshiba laptops. This commit adds a check for Dell laptops to the code for handling these extra button bits, fixing this regression. This patch has been tested on a Dell Latitude D620 to make sure that it does not reintroduce the original problem. Reported-and-tested-by: Douglas Christman <douglaschristman@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'Documentation/input')
-rw-r--r--Documentation/input/alps.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt
index e301887d8523..765d99cdadbb 100644
--- a/Documentation/input/alps.txt
+++ b/Documentation/input/alps.txt
@@ -119,8 +119,10 @@ ALPS Absolute Mode - Protocol Version 2
byte 5: 0 z6 z5 z4 z3 z2 z1 z0
Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for
-the DualPoint Stick. For non interleaved dualpoint devices the pointingstick
-buttons get reported separately in the PSM, PSR and PSL bits.
+the DualPoint Stick. The M, R and L bits signal the combined status of both
+the pointingstick and touchpad buttons, except for Dell dualpoint devices
+where the pointingstick buttons get reported separately in the PSM, PSR
+and PSL bits.
Dualpoint device -- interleaved packet format
---------------------------------------------