HID: wacom: Have WACOM_PEN_FIELD and WACOM_FINGER_FIELD recgonize more fields

We've defined several new usages (e.g. WACOM_G9_PEN and WACOM_G9_TOUCHSCREEN)
which aren't checked by the WACOM_PEN_FIELD and WACOM_FINGER_FIELD macros but
probably should be.

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index f58bbd18209ca0e1cef1d98f0149f56739756f47..d2629c81c51ae8f0650048c97cc9a9604266868e 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -98,10 +98,14 @@
                                 ((f)->physical == HID_DG_PEN) || \
                                 ((f)->application == HID_DG_PEN) || \
                                 ((f)->application == HID_DG_DIGITIZER) || \
-                                ((f)->application == WACOM_HID_WD_DIGITIZER))
+                                ((f)->application == WACOM_HID_WD_DIGITIZER) || \
+                                ((f)->application == WACOM_HID_G9_PEN) || \
+                                ((f)->application == WACOM_HID_G11_PEN))
 #define WACOM_FINGER_FIELD(f)  (((f)->logical == HID_DG_FINGER) || \
                                 ((f)->physical == HID_DG_FINGER) || \
-                                ((f)->application == HID_DG_TOUCHSCREEN))
+                                ((f)->application == HID_DG_TOUCHSCREEN) || \
+                                ((f)->application == WACOM_HID_G9_TOUCHSCREEN) || \
+                                ((f)->application == WACOM_HID_G11_TOUCHSCREEN))
 
 enum {
        PENPARTNER = 0,