Commit 50635115 authored by Henrik Rydberg's avatar Henrik Rydberg Committed by Dmitry Torokhov

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: default avatarHenrik Rydberg <rydberg@euromail.se>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 1d64b655
...@@ -390,10 +390,6 @@ static int report_tp_state(struct bcm5974 *dev, int size) ...@@ -390,10 +390,6 @@ static int report_tp_state(struct bcm5974 *dev, int size)
ptest = int2bound(&c->p, raw_p); ptest = int2bound(&c->p, raw_p);
origin = raw2int(f->origin); 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 */ /* while tracking finger still valid, count all fingers */
if (ptest > PRESSURE_LOW && origin) { if (ptest > PRESSURE_LOW && origin) {
abs_p = ptest; abs_p = ptest;
...@@ -412,6 +408,10 @@ static int report_tp_state(struct bcm5974 *dev, int size) ...@@ -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) if (dev->fingers < nmin)
dev->fingers = nmin; dev->fingers = nmin;
if (dev->fingers > nmax) if (dev->fingers > nmax)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment