diff options
| author |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2017-05-23 14:15:24 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-29 20:00:24 -0700 |
| commit | f4947d79a7080b25829997eeee38d4d65137c161 (patch) | |
| tree | c46589b14b524fc4b9502b2efd0fc136bb01bccd /drivers/input/mouse/synaptics.c | |
| parent | Input: synaptics - clear device info before filling in (diff) | |
| download | linux-dev-f4947d79a7080b25829997eeee38d4d65137c161.tar.xz linux-dev-f4947d79a7080b25829997eeee38d4d65137c161.zip | |
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>
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 4f97970abc94..9b27a6c710b2 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -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."); |