Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8c127f0717b438e6abc3d92d4ae248c4224b9dcb

Authored by Hans Petter Selasky
Committed by Dmitry Torokhov
1 parent b73077eb03
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Input: properly assign return value of clamp() macro. 

[dtor@mail.ru: added mousedev changes]
Signed-off-by: Hans Petter Selasky <hselasky@c2i.net>
Cc: stable@kernel.org
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

drivers/input/input.c
Diff comments   View file @ 8c127f0
... ... @@ -1756,7 +1756,7 @@
1756 1756 } else if (test_bit(ABS_MT_TRACKING_ID, dev->absbit)) {
1757 1757 mt_slots = dev->absinfo[ABS_MT_TRACKING_ID].maximum -
1758 1758 dev->absinfo[ABS_MT_TRACKING_ID].minimum + 1,
1759   - clamp(mt_slots, 2, 32);
  1759 + mt_slots = clamp(mt_slots, 2, 32);
1760 1760 } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
1761 1761 mt_slots = 2;
1762 1762 } else {
drivers/input/mousedev.c
Diff comments   View file @ 8c127f0
... ... @@ -187,7 +187,7 @@
187 187 if (size == 0)
188 188 size = xres ? : 1;
189 189  
190   - clamp(value, min, max);
  190 + value = clamp(value, min, max);
191 191  
192 192 mousedev->packet.x = ((value - min) * xres) / size;
193 193 mousedev->packet.abs_event = 1;
... ... @@ -201,7 +201,7 @@
201 201 if (size == 0)
202 202 size = yres ? : 1;
203 203  
204   - clamp(value, min, max);
  204 + value = clamp(value, min, max);
205 205  
206 206 mousedev->packet.y = yres - ((value - min) * yres) / size;
207 207 mousedev->packet.abs_event = 1;