]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Input: synaptics - keep PS/2 around when RMI4_SMB is not enabled
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tue, 23 May 2017 21:15:24 +0000 (14:15 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 30 May 2017 03:00:24 +0000 (20:00 -0700)
Or the user might have the touchpad unbound from PS/2 but never picked
up by rmi-smbus.ko

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/synaptics.c

index 4f97970abc947672ec5318c5ce2c4a2e17b430f2..9b27a6c710b2bbc6bffa144bd97382d2c350d0de 100644 (file)
@@ -1689,7 +1689,8 @@ enum {
        SYNAPTICS_INTERTOUCH_ON,
 };
 
-static int synaptics_intertouch = SYNAPTICS_INTERTOUCH_NOT_SET;
+static int synaptics_intertouch = IS_ENABLED(CONFIG_RMI4_SMB) ?
+               SYNAPTICS_INTERTOUCH_NOT_SET : SYNAPTICS_INTERTOUCH_OFF;
 module_param_named(synaptics_intertouch, synaptics_intertouch, int, 0644);
 MODULE_PARM_DESC(synaptics_intertouch, "Use a secondary bus for the Synaptics device.");