Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4...

[mirror_ubuntu-bionic-kernel.git] / drivers / hid / wacom_wac.c

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index d811e878a1058f0b52348bf17ea9866464a04b4a..232da89f4e886fe02b82d452c1a0868f0b65b967 100644 (file)
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1072,6 +1072,9 @@ static int wacom_wac_finger_count_touches(struct wacom_wac *wacom)
        int count = 0;
        int i;
 
+       if (!touch_max)
+               return 0;
+
        if (touch_max == 1)
                return test_bit(BTN_TOUCH, input->key) &&
                       !wacom->shared->stylus_in_proximity;