1 files changed, 16 insertions, 18 deletions

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 59b8e27909d4..4d559c1e7779 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1768,9 +1768,6 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
         if (data[0] != WACOM_REPORT_PENABLED)
             return 0;
 
-        if (wacom->shared->touch_down)
-                return 0;
-
         prox = (data[1] & 0x20) == 0x20;
 
         /*
@@ -1783,17 +1780,21 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
          *
          * Hardware does report zero in most out-of-prox cases but not all.
          */
-        if (prox) {
-                if (!wacom->shared->stylus_in_proximity) {
-                        if (data[1] & 0x08) {
-                                wacom->tool[0] = BTN_TOOL_RUBBER;
-                                wacom->id[0] = ERASER_DEVICE_ID;
-                        } else {
-                                wacom->tool[0] = BTN_TOOL_PEN;
-                                wacom->id[0] = STYLUS_DEVICE_ID;
-                        }
-                        wacom->shared->stylus_in_proximity = true;
+        if (!wacom->shared->stylus_in_proximity) {
+                if (data[1] & 0x08) {
+                        wacom->tool[0] = BTN_TOOL_RUBBER;
+                        wacom->id[0] = ERASER_DEVICE_ID;
+                } else {
+                        wacom->tool[0] = BTN_TOOL_PEN;
+                        wacom->id[0] = STYLUS_DEVICE_ID;
                 }
+        }
+
+        wacom->shared->stylus_in_proximity = prox;
+        if (wacom->shared->touch_down)
+                return 0;
+
+        if (prox) {
                 x = le16_to_cpup((__le16 *)&data[2]);
                 y = le16_to_cpup((__le16 *)&data[4]);
                 p = le16_to_cpup((__le16 *)&data[6]);
@@ -1809,6 +1810,8 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
                 pen = data[1] & 0x01;
                 btn1 = data[1] & 0x02;
                 btn2 = data[1] & 0x04;
+        } else {
+                wacom->id[0] = 0;
         }
 
         input_report_key(input, BTN_TOUCH, pen);
@@ -1820,11 +1823,6 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
         input_report_abs(input, ABS_PRESSURE, p);
         input_report_abs(input, ABS_DISTANCE, d);
 
-        if (!prox) {
-                wacom->id[0] = 0;
-                wacom->shared->stylus_in_proximity = false;
-        }
-
         input_report_key(input, wacom->tool[0], prox); /* PEN or RUBBER */
         input_report_abs(input, ABS_MISC, wacom->id[0]); /* TOOL ID */