On Fri, Nov 15, 2013 at 1:59 PM, Ping Cheng <[email protected]> wrote: > Old single touch Tablet PCs do not have touch_max set at > wacom_features. Since touch device at lease supports one > finger, assign touch_max to 1 when touch usage is defined > in its HID Descriptor and touch_max is not pre-defined.
Reviewed-by: Chris Bagwell <[email protected]> > > Tested-by: Jason Gerecke <[email protected]> > Signed-off-by: Ping Cheng <[email protected]> > --- > drivers/input/tablet/wacom_sys.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/tablet/wacom_sys.c > b/drivers/input/tablet/wacom_sys.c > index 8a90da1..3d71b60 100644 > --- a/drivers/input/tablet/wacom_sys.c > +++ b/drivers/input/tablet/wacom_sys.c > @@ -304,7 +304,7 @@ static int wacom_parse_hid(struct usb_interface *intf, > struct usb_device *dev = interface_to_usbdev(intf); > char limit = 0; > /* result has to be defined as int for some devices */ > - int result = 0; > + int result = 0, touch_max = 0; > int i = 0, usage = WCM_UNDEFINED, finger = 0, pen = 0; > unsigned char *report; > > @@ -351,7 +351,8 @@ static int wacom_parse_hid(struct usb_interface *intf, > if (usage == WCM_DESKTOP) { > if (finger) { > features->device_type = > BTN_TOOL_FINGER; > - > + /* touch device at least > supports one touch point */ > + touch_max = 1; > switch (features->type) { > case TABLETPC2FG: > features->pktlen = > WACOM_PKGLEN_TPC2FG; > @@ -504,6 +505,8 @@ static int wacom_parse_hid(struct usb_interface *intf, > } > > out: > + if (!features->touch_max && touch_max) > + features->touch_max = touch_max; > result = 0; > kfree(report); > return result; > -- > 1.8.3.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
