[PATCH] Input: adc-joystick - fix optional value handling

John Keeping posted 1 patch 1 year, 4 months ago
drivers/input/joystick/adc-joystick.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
[PATCH] Input: adc-joystick - fix optional value handling
Posted by John Keeping 1 year, 4 months ago
The abs-fuzz and abs-flat properties are documented as optional.  When
these are absent, fwnode_property_read_u32() will leave the input
unchanged, meaning that an axis either picks up the value for the
previous axis or an uninitialized value.

Explicitly set these values to zero when they are unspecified to match
the documented behaviour in the device tree bindings.

Signed-off-by: John Keeping <jkeeping@inmusicbrands.com>
---
 drivers/input/joystick/adc-joystick.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c
index 130245be884bc..02713e624df1c 100644
--- a/drivers/input/joystick/adc-joystick.c
+++ b/drivers/input/joystick/adc-joystick.c
@@ -180,8 +180,11 @@ static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy)
 			swap(range[0], range[1]);
 		}
 
-		fwnode_property_read_u32(child, "abs-fuzz", &fuzz);
-		fwnode_property_read_u32(child, "abs-flat", &flat);
+		if (fwnode_property_read_u32(child, "abs-fuzz", &fuzz))
+			fuzz = 0;
+
+		if (fwnode_property_read_u32(child, "abs-flat", &flat))
+			flat = 0;
 
 		input_set_abs_params(joy->input, axes[i].code,
 				     range[0], range[1], fuzz, flat);
-- 
2.45.2
Re: [PATCH] Input: adc-joystick - fix optional value handling
Posted by Dmitry Torokhov 1 year, 4 months ago
On Wed, Jul 31, 2024 at 10:33:09AM +0100, John Keeping wrote:
> The abs-fuzz and abs-flat properties are documented as optional.  When
> these are absent, fwnode_property_read_u32() will leave the input
> unchanged, meaning that an axis either picks up the value for the
> previous axis or an uninitialized value.
> 
> Explicitly set these values to zero when they are unspecified to match
> the documented behaviour in the device tree bindings.
> 
> Signed-off-by: John Keeping <jkeeping@inmusicbrands.com>

Applied, thank you.

-- 
Dmitry