2015-07-21 13:55:40

by Jiri Kosina

Subject: [PATCH] Input: synaptics: dump ext10 capabilities as well

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

Signed-off-by: Jiri Kosina <[email protected]>
---
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

2015-07-21 14:13:17

by Benjamin Tissoires

Subject: Re: [PATCH] Input: synaptics: dump ext10 capabilities as well

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 <[email protected]>
> ---

Works for me.

Reviewed-by: Benjamin Tissoires <[email protected]>

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