From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936541AbdEWIhM (ORCPT ); Tue, 23 May 2017 04:37:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45290 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933846AbdEWIhF (ORCPT ); Tue, 23 May 2017 04:37:05 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 68B782D9FC2 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=benjamin.tissoires@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 68B782D9FC2 From: Benjamin Tissoires To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] Input: synaptics - keep PS/2 around when RMI4_SMB is not compiled in Date: Tue, 23 May 2017 10:36:55 +0200 Message-Id: <20170523083657.11148-1-benjamin.tissoires@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 23 May 2017 08:37:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Or the user might have the touchpad unbound from PS/2 but never picked up by rmi-smbus.ko Signed-off-by: Benjamin Tissoires --- drivers/input/mouse/synaptics.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 131df9d..58ff388 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -1687,7 +1687,11 @@ enum { SYNAPTICS_INTERTOUCH_ON, }; +#if IS_ENABLED(CONFIG_RMI4_SMB) static int synaptics_intertouch = SYNAPTICS_INTERTOUCH_NOT_SET; +#else /* CONFIG_RMI4_SMB */ +static int synaptics_intertouch = SYNAPTICS_INTERTOUCH_OFF; +#endif /* CONFIG_RMI4_SMB */ module_param_named(synaptics_intertouch, synaptics_intertouch, int, 0644); MODULE_PARM_DESC(synaptics_intertouch, "Use a secondary bus for the Synaptics device."); -- 2.9.4