diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 02:28:35 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 02:28:35 -0400 |
| commit | 57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch) | |
| tree | ee9289f0898054474b7e5054abdb3ffb78666436 /drivers/input/mouse/sentelic.c | |
| parent | 486c8aba39e5f194519cd5c0e85e5d1de8b74b03 (diff) | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
Merge commit 'v3.4-rc4' into next
Diffstat (limited to 'drivers/input/mouse/sentelic.c')
| -rw-r--r-- | drivers/input/mouse/sentelic.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c index a977bfaa6821..661a0ca3b3d6 100644 --- a/drivers/input/mouse/sentelic.c +++ b/drivers/input/mouse/sentelic.c | |||
| @@ -741,6 +741,14 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse) | |||
| 741 | } | 741 | } |
| 742 | } else { | 742 | } else { |
| 743 | /* SFAC packet */ | 743 | /* SFAC packet */ |
| 744 | if ((packet[0] & (FSP_PB0_LBTN|FSP_PB0_PHY_BTN)) == | ||
| 745 | FSP_PB0_LBTN) { | ||
| 746 | /* On-pad click in SFAC mode should be handled | ||
| 747 | * by userspace. On-pad clicks in MFMC mode | ||
| 748 | * are real clickpad clicks, and not ignored. | ||
| 749 | */ | ||
| 750 | packet[0] &= ~FSP_PB0_LBTN; | ||
| 751 | } | ||
| 744 | 752 | ||
| 745 | /* no multi-finger information */ | 753 | /* no multi-finger information */ |
| 746 | ad->last_mt_fgr = 0; | 754 | ad->last_mt_fgr = 0; |