summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2011-02-25 09:33:13 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-02-27 01:48:30 -0800
commit5063511539bbb436ae8e4f75409561ef547f8516 (patch)
treec1418aacceda9dc4933bbeb93a332cc7c9fe8d54
parent1d64b655dc083df5c5ac39945ccbbc6532903bf1 (diff)
downloadlinux-5063511539bbb436ae8e4f75409561ef547f8516.tar.gz
linux-5063511539bbb436ae8e4f75409561ef547f8516.tar.bz2
linux-5063511539bbb436ae8e4f75409561ef547f8516.zip
Input: bcm5974 - Report button also for zero fingers
With the current code, pressing the integrated button with an isolating tool does not result in any button report. Fixed with this this patch. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/mouse/bcm5974.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index b95231763911..d24837210f04 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -390,10 +390,6 @@ static int report_tp_state(struct bcm5974 *dev, int size)
ptest = int2bound(&c->p, raw_p);
origin = raw2int(f->origin);
- /* set the integrated button if applicable */
- if (c->tp_type == TYPE2)
- ibt = raw2int(dev->tp_data[BUTTON_TYPE2]);
-
/* while tracking finger still valid, count all fingers */
if (ptest > PRESSURE_LOW && origin) {
abs_p = ptest;
@@ -412,6 +408,10 @@ static int report_tp_state(struct bcm5974 *dev, int size)
}
}
+ /* set the integrated button if applicable */
+ if (c->tp_type == TYPE2)
+ ibt = raw2int(dev->tp_data[BUTTON_TYPE2]);
+
if (dev->fingers < nmin)
dev->fingers = nmin;
if (dev->fingers > nmax)