On Wed, Nov 07, 2012 at 05:37:31PM +0100, Benjamin Tissoires wrote: > Win 8 device specification changed the requirements for the hid usages > of the multitouch devices. Now InRange is optional and must be only > used when the device supports hovering. > > This ensures that the quirk ALWAYS_VALID is taken into account and > also ensures its precedence over the other VALID* quirks. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxx> > --- > drivers/hid/hid-multitouch.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c > index 54367f4..2352770 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -503,7 +503,7 @@ static int mt_compute_slot(struct mt_device *td, struct input_dev *input) > */ > static void mt_complete_slot(struct mt_device *td, struct input_dev *input) > { > - if (td->curvalid) { > + if (td->curvalid || (td->mtclass.quirks & MT_QUIRK_ALWAYS_VALID)) { > int slotnum = mt_compute_slot(td, input); > struct mt_slot *s = &td->curdata; > > @@ -554,9 +554,7 @@ static int mt_event(struct hid_device *hid, struct hid_field *field, > if (hid->claimed & HID_CLAIMED_INPUT) { > switch (usage->hid) { > case HID_DG_INRANGE: > - if (quirks & MT_QUIRK_ALWAYS_VALID) > - td->curvalid = true; > - else if (quirks & MT_QUIRK_VALID_IS_INRANGE) > + if (quirks & MT_QUIRK_VALID_IS_INRANGE) > td->curvalid = value; > break; > case HID_DG_TIPSWITCH: > -- > 1.7.11.7 > Reviewed-by: Henrik Rydberg <rydberg@xxxxxxxxxxx> Thanks, Henrik -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html