public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Input: synaptics: dump ext10 capabilities as well
@ 2015-07-21 13:34 Jiri Kosina
  2015-07-21 14:13 ` Benjamin Tissoires
  0 siblings, 1 reply; 2+ messages in thread
From: Jiri Kosina @ 2015-07-21 13:34 UTC (permalink / raw)
  To: Benjamin Tissoires, Hans de Goede, Dmitry Torokhov
  Cc: linux-input, linux-kernel, Vojtech Pavlik

Make extended capabilities obtained through $10 query also available in 
touchpad identification.

Signed-off-by: Jiri Kosina <jkosina@suse.com>
---
 drivers/input/mouse/synaptics.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 3a32caf..6025eb4 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -1484,12 +1484,12 @@ static int __synaptics_init(struct psmouse *psmouse, bool absolute_mode)
 	priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;
 
 	psmouse_info(psmouse,
-		     "Touchpad model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx, board id: %lu, fw id: %lu\n",
+		     "Touchpad model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx/%#lx, board id: %lu, fw id: %lu\n",
 		     SYN_ID_MODEL(priv->identity),
 		     SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),
 		     priv->model_id,
 		     priv->capabilities, priv->ext_cap, priv->ext_cap_0c,
-		     priv->board_id, priv->firmware_id);
+		     priv->ext_cap_10, priv->board_id, priv->firmware_id);
 
 	set_input_params(psmouse, priv);
 
-- 
Jiri Kosina
SUSE Labs

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Input: synaptics: dump ext10 capabilities as well
  2015-07-21 13:34 [PATCH] Input: synaptics: dump ext10 capabilities as well Jiri Kosina
@ 2015-07-21 14:13 ` Benjamin Tissoires
  0 siblings, 0 replies; 2+ messages in thread
From: Benjamin Tissoires @ 2015-07-21 14:13 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: Hans de Goede, Dmitry Torokhov, linux-input, linux-kernel,
	Vojtech Pavlik

On Jul 21 2015 or thereabouts, Jiri Kosina wrote:
> Make extended capabilities obtained through $10 query also available in 
> touchpad identification.
> 
> Signed-off-by: Jiri Kosina <jkosina@suse.com>
> ---

Works for me.

Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Cheers,
Benjamin

>  drivers/input/mouse/synaptics.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
> index 3a32caf..6025eb4 100644
> --- a/drivers/input/mouse/synaptics.c
> +++ b/drivers/input/mouse/synaptics.c
> @@ -1484,12 +1484,12 @@ static int __synaptics_init(struct psmouse *psmouse, bool absolute_mode)
>  	priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;
>  
>  	psmouse_info(psmouse,
> -		     "Touchpad model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx, board id: %lu, fw id: %lu\n",
> +		     "Touchpad model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx/%#lx, board id: %lu, fw id: %lu\n",
>  		     SYN_ID_MODEL(priv->identity),
>  		     SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),
>  		     priv->model_id,
>  		     priv->capabilities, priv->ext_cap, priv->ext_cap_0c,
> -		     priv->board_id, priv->firmware_id);
> +		     priv->ext_cap_10, priv->board_id, priv->firmware_id);
>  
>  	set_input_params(psmouse, priv);
>  
> -- 
> Jiri Kosina
> SUSE Labs

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-07-21 14:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-21 13:34 [PATCH] Input: synaptics: dump ext10 capabilities as well Jiri Kosina
2015-07-21 14:13 ` Benjamin Tissoires

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox