Explorar el Código

Input: synaptics - keep PS/2 around when RMI4_SMB is not enabled

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>
Benjamin Tissoires hace 8 años
padre
commit
f4947d79a7
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. 2 1
      drivers/input/mouse/synaptics.c

+ 2 - 1
drivers/input/mouse/synaptics.c

@@ -1689,7 +1689,8 @@ enum {
 	SYNAPTICS_INTERTOUCH_ON,
 	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_param_named(synaptics_intertouch, synaptics_intertouch, int, 0644);
 MODULE_PARM_DESC(synaptics_intertouch, "Use a secondary bus for the Synaptics device.");
 MODULE_PARM_DESC(synaptics_intertouch, "Use a secondary bus for the Synaptics device.");