diff mbox

Input: synaptics: dump ext10 capabilities as well

Message ID alpine.LNX.2.00.1507211529230.1141@pobox.suse.cz (mailing list archive)
State New, archived
Headers show

Commit Message

Jiri Kosina July 21, 2015, 1:34 p.m. UTC
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(-)

Comments

Benjamin Tissoires July 21, 2015, 2:13 p.m. UTC | #1
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
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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);