Revert "HID: logitech: fix a used uninitialized GCC warning"
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Wed, 21 Nov 2018 15:27:07 +0000 (16:27 +0100)
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>
Thu, 22 Nov 2018 07:57:03 +0000 (08:57 +0100)
This reverts commit 5fe2ccbef9d7aecf5c4402c753444f1a12096cfd.

It turns out the current API is not that compatible with
some Microsoft mice, so better start again from scratch.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Harry Cutts <hcutts@chromium.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-logitech-hidpp.c

index f01280898b24bd7fea8770417137586823578550..5f0c080059c68dbfc2eb84f3d8e0e02dd3367461 100644 (file)
@@ -1231,6 +1231,7 @@ static int hidpp_hrw_get_wheel_capability(struct hidpp_device *hidpp,
        *multiplier = response.fap.params[0];
        return 0;
 return_default:
        *multiplier = response.fap.params[0];
        return 0;
 return_default:
+       *multiplier = 8;
        hid_warn(hidpp->hid_dev,
                 "Couldn't get wheel multiplier (error %d), assuming %d.\n",
                 ret, *multiplier);
        hid_warn(hidpp->hid_dev,
                 "Couldn't get wheel multiplier (error %d), assuming %d.\n",
                 ret, *multiplier);
@@ -2695,7 +2696,7 @@ static int hi_res_scroll_look_up_microns(__u32 product_id)
 static int hi_res_scroll_enable(struct hidpp_device *hidpp)
 {
        int ret;
 static int hi_res_scroll_enable(struct hidpp_device *hidpp)
 {
        int ret;
-       u8 multiplier = 8;
+       u8 multiplier;
 
        if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_X2121) {
                ret = hidpp_hrw_set_wheel_mode(hidpp, false, true, false);
 
        if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_X2121) {
                ret = hidpp_hrw_set_wheel_mode(hidpp, false, true, false);
@@ -2703,9 +2704,10 @@ static int hi_res_scroll_enable(struct hidpp_device *hidpp)
        } else if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_X2120) {
                ret = hidpp_hrs_set_highres_scrolling_mode(hidpp, true,
                                                           &multiplier);
        } else if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_X2120) {
                ret = hidpp_hrs_set_highres_scrolling_mode(hidpp, true,
                                                           &multiplier);
-       } else /* if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_1P0) */
+       } else /* if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_1P0) */ {
                ret = hidpp10_enable_scrolling_acceleration(hidpp);
                ret = hidpp10_enable_scrolling_acceleration(hidpp);
-
+               multiplier = 8;
+       }
        if (ret)
                return ret;
 
        if (ret)
                return ret;