Commit 5fe2ccbe authored by zhong jiang's avatar zhong jiang Committed by Jiri Kosina

HID: logitech: fix a used uninitialized GCC warning

Fix the following compile warning:

drivers/hid/hid-logitech-hidpp.c: In function 'hi_res_scroll_enable':
drivers/hid/hid-logitech-hidpp.c:2714:54: warning: 'multiplier' may be used uninitialized in this function [-Wmaybe-uninitialized]
  hidpp->vertical_wheel_counter.resolution_multiplier = multiplier;
Signed-off-by: default avatarzhong jiang <zhongjiang@huawei.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 3fe1d6bb
...@@ -1231,7 +1231,6 @@ static int hidpp_hrw_get_wheel_capability(struct hidpp_device *hidpp, ...@@ -1231,7 +1231,6 @@ static int hidpp_hrw_get_wheel_capability(struct hidpp_device *hidpp,
*multiplier = response.fap.params[0]; *multiplier = response.fap.params[0];
return 0; return 0;
return_default: return_default:
*multiplier = 8;
hid_warn(hidpp->hid_dev, hid_warn(hidpp->hid_dev,
"Couldn't get wheel multiplier (error %d), assuming %d.\n", "Couldn't get wheel multiplier (error %d), assuming %d.\n",
ret, *multiplier); ret, *multiplier);
...@@ -2696,7 +2695,7 @@ static int hi_res_scroll_look_up_microns(__u32 product_id) ...@@ -2696,7 +2695,7 @@ static int hi_res_scroll_look_up_microns(__u32 product_id)
static int hi_res_scroll_enable(struct hidpp_device *hidpp) static int hi_res_scroll_enable(struct hidpp_device *hidpp)
{ {
int ret; int ret;
u8 multiplier; u8 multiplier = 8;
if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_X2121) { if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_X2121) {
ret = hidpp_hrw_set_wheel_mode(hidpp, false, true, false); ret = hidpp_hrw_set_wheel_mode(hidpp, false, true, false);
...@@ -2704,10 +2703,9 @@ static int hi_res_scroll_enable(struct hidpp_device *hidpp) ...@@ -2704,10 +2703,9 @@ static int hi_res_scroll_enable(struct hidpp_device *hidpp)
} else if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_X2120) { } else if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_X2120) {
ret = hidpp_hrs_set_highres_scrolling_mode(hidpp, true, ret = hidpp_hrs_set_highres_scrolling_mode(hidpp, true,
&multiplier); &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) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment