Update to upstream 2.6.38-rc8+

This version includes the latest button bugfix.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

1 files changed, 4 insertions, 4 deletions

diff --git a/usr/src/dkms_source_tree/bcm5974.c b/usr/src/dkms_source_tree/bcm5974.c
index ee82851..0efaf66 100644
--- a/usr/src/dkms_source_tree/bcm5974.c
+++ b/usr/src/dkms_source_tree/bcm5974.c
@@ -430,10 +430,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;
@@ -452,6 +448,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)