From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 22 Jun 2015 14:23:43 +0000 (+0200)
Subject: Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4... 
X-Git-Tag: v4.2-rc1~153^2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=ec3b34e1975670e68be3abff76f56dbb41dd417c

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

Conflicts:
	drivers/hid/wacom_wac.c
---

ec3b34e1975670e68be3abff76f56dbb41dd417c
diff --cc drivers/hid/wacom_wac.c
index adf959dcfa5d,adf959dcfa5d,fa54d3290659,adf959dcfa5d,adf959dcfa5d,fa54d3290659,fa54d3290659,fa54d3290659,d811e878a105..232da89f4e88
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@@@@@@@@@ -1072,12 -1072,12 -1072,9 -1072,12 -1072,12 -1072,9 -1072,9 -1072,9 -1072,8 +1072,11 @@@@@@@@@@ static int wacom_wac_finger_count_touch
         	int count = 0;
         	int i;
         
  -  --- 	/* non-HID_GENERIC single touch input doesn't call this routine */
  -  --- 	if ((touch_max == 1) && (wacom->features.type == HID_GENERIC))
  -  --- 		return wacom->hid_data.tipswitch &&
  +  ++++	if (!touch_max)
  +  ++++		return 0;
  +  ++++
-- --    	/* non-HID_GENERIC single touch input doesn't call this routine */
-- --    	if ((touch_max == 1) && (wacom->features.type == HID_GENERIC))
-- --    		return wacom->hid_data.tipswitch &&
++++++++ 	if (touch_max == 1)
++++++++ 		return test_bit(BTN_TOUCH, input->key) &&
         		       !wacom->shared->stylus_in_proximity;
         
         	for (i = 0; i < input->mt->num_slots; i++) {