diff mbox

[Quantal] UBUNTU: SAUCE: input: Cypress PS/2 Trackpad move PSMOUSE_CYPRESS enum

Message ID 1346966909.22677.255.camel@fourier
State New
Headers show

Commit Message

Kamal Mostafa Sept. 6, 2012, 9:28 p.m. UTC 
Bug reference:
    https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1041594
    Edge scrolling on ALPS touchpad broken since the upgrade to 3.5.0-11


Thanks,

 -Kamal

----------

commit 32b7bb1aa831a7780d7418a7ec829d7216c2a962
Author: Kamal Mostafa <kamal@canonical.com>
Date:   Thu Sep 6 12:53:40 2012 -0700

    UBUNTU: SAUCE: input: Cypress PS/2 Trackpad move PSMOUSE_CYPRESS enum
    
    Move PSMOUSE_CYPRESS to the end of the enum, since awful
    src/eventcomm.c in x-x-i-s actually depends on hardcoded values
    of the model numbers (including MODEL_ALPS).  *sigh*
    
    BugLink: http://launchpad.net/bugs/1041594
    
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>

Comments

Tim Gardner Sept. 6, 2012, 11:40 p.m. UTC | #1
diff mbox

Patch

diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index ed788d0..148286b 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -79,6 +79,9 @@  struct psmouse {
 };
 
 enum psmouse_type {
+	/* IMPORTANT! src/eventcomm.c in x-x-i-s uses the hard-coded values
+	 * of some of these (awful!), so never insert new entries to the
+	 * middle of the list!  */
 	PSMOUSE_NONE,
 	PSMOUSE_PS2,
 	PSMOUSE_PS2PP,
@@ -87,7 +90,6 @@  enum psmouse_type {
 	PSMOUSE_IMPS,
 	PSMOUSE_IMEX,
 	PSMOUSE_SYNAPTICS,
-	PSMOUSE_CYPRESS,
 	PSMOUSE_ALPS,
 	PSMOUSE_LIFEBOOK,
 	PSMOUSE_TRACKPOINT,
@@ -97,6 +99,7 @@  enum psmouse_type {
 	PSMOUSE_ELANTECH,
 	PSMOUSE_FSP,
 	PSMOUSE_SYNAPTICS_RELATIVE,
+	PSMOUSE_CYPRESS,
 	PSMOUSE_AUTO		/* This one should always be last */
 };