1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index fc553e3f948d..f2a481125522 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -1441,6 +1441,25 @@ static int hidpp_input_mapping(struct hid_device *hdev, struct hid_input *hi,
         return 0;
 }
 
+static int hidpp_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+                struct hid_field *field, struct hid_usage *usage,
+                unsigned long **bit, int *max)
+{
+        struct hidpp_device *hidpp = hid_get_drvdata(hdev);
+
+        /* Ensure that Logitech G920 is not given a default fuzz/flat value */
+        if (hidpp->quirks & HIDPP_QUIRK_CLASS_G920) {
+                if (usage->type == EV_ABS && (usage->code == ABS_X ||
+                                usage->code == ABS_Y || usage->code == ABS_Z ||
+                                usage->code == ABS_RZ)) {
+                        field->application = HID_GD_MULTIAXIS;
+                }
+        }
+
+        return 0;
+}
+
+
 static void hidpp_populate_input(struct hidpp_device *hidpp,
                 struct input_dev *input, bool origin_is_hid_core)
 {
@@ -1875,6 +1894,7 @@ static struct hid_driver hidpp_driver = {
         .raw_event = hidpp_raw_event,
         .input_configured = hidpp_input_configured,
         .input_mapping = hidpp_input_mapping,
+        .input_mapped = hidpp_input_mapped,
 };
 
 module_hid_driver(hidpp_driver);