Messages in this thread | | | Date | Tue, 17 Mar 2015 13:27:00 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the input tree with the input-current tree |
| |
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in drivers/input/mouse/synaptics.c between commit dc5465dc8a6d ("Input: synaptics - fix middle button on Lenovo 2015 products") from the input-current tree and commit de4e374b401a ("Input: synaptics - switch ForcePad detection to PNP IDs") from the input tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/input/mouse/synaptics.c index dda605836546,4c69e3304011..000000000000 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@@ -670,20 -612,6 +677,18 @@@ static void synaptics_parse_agm(const u } } +static void synaptics_parse_ext_buttons(const unsigned char buf[], + struct synaptics_data *priv, + struct synaptics_hw_state *hw) +{ + unsigned int ext_bits = + (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1; + unsigned int ext_mask = GENMASK(ext_bits - 1, 0); + + hw->ext_buttons = buf[4] & ext_mask; + hw->ext_buttons |= (buf[5] & ext_mask) << ext_bits; +} + - static bool is_forcepad; static int synaptics_parse_hw_state(const unsigned char buf[], struct synaptics_data *priv, struct synaptics_hw_state *hw) [unhandled content-type:application/pgp-signature] | |