HID: wacom: Correct behavior when processing some confidence == false touches

[platform/kernel/linux-rpi.git] / drivers / hid / hid-logitech-hidpp.c

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index c582d19..7bf12ca 100644 (file)
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -1835,15 +1835,14 @@ static int hidpp_battery_get_property(struct power_supply *psy,
 /* -------------------------------------------------------------------------- */
 #define HIDPP_PAGE_WIRELESS_DEVICE_STATUS                      0x1d4b
 
-static int hidpp_set_wireless_feature_index(struct hidpp_device *hidpp)
+static int hidpp_get_wireless_feature_index(struct hidpp_device *hidpp, u8 *feature_index)
 {
        u8 feature_type;
        int ret;
 
        ret = hidpp_root_get_feature(hidpp,
                                     HIDPP_PAGE_WIRELESS_DEVICE_STATUS,
-                                    &hidpp->wireless_feature_index,
-                                    &feature_type);
+                                    feature_index, &feature_type);
 
        return ret;
 }
@@ -4249,6 +4248,13 @@ static void hidpp_connect_event(struct hidpp_device *hidpp)
                }
        }
 
+       if (hidpp->protocol_major >= 2) {
+               u8 feature_index;
+
+               if (!hidpp_get_wireless_feature_index(hidpp, &feature_index))
+                       hidpp->wireless_feature_index = feature_index;
+       }
+
        if (hidpp->name == hdev->name && hidpp->protocol_major >= 2) {
                name = hidpp_get_device_name(hidpp);
                if (name) {
@@ -4493,14 +4499,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
                hidpp_overwrite_name(hdev);
        }
 
-       if (connected && hidpp->protocol_major >= 2) {
-               ret = hidpp_set_wireless_feature_index(hidpp);
-               if (ret == -ENOENT)
-                       hidpp->wireless_feature_index = 0;
-               else if (ret)
-                       goto hid_hw_init_fail;
-       }
-
        if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP)) {
                ret = wtp_get_config(hidpp);
                if (ret)