Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y

[platform/kernel/linux-rpi.git] / drivers / input / touchscreen.c

diff --git a/drivers/input/touchscreen.c b/drivers/input/touchscreen.c
index dd18cb9..4620e20 100644 (file)
--- a/drivers/input/touchscreen.c
+++ b/drivers/input/touchscreen.c
@@ -80,27 +80,27 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
 
        data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x",
                                                input_abs_get_min(input, axis_x),
-                                               &minimum) |
-                      touchscreen_get_prop_u32(dev, "touchscreen-size-x",
-                                               input_abs_get_max(input,
-                                                                 axis_x) + 1,
-                                               &maximum) |
-                      touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x",
-                                               input_abs_get_fuzz(input, axis_x),
-                                               &fuzz);
+                                               &minimum);
+       data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-x",
+                                                input_abs_get_max(input,
+                                                                  axis_x) + 1,
+                                                &maximum);
+       data_present |= touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x",
+                                                input_abs_get_fuzz(input, axis_x),
+                                                &fuzz);
        if (data_present)
                touchscreen_set_params(input, axis_x, minimum, maximum - 1, fuzz);
 
        data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y",
                                                input_abs_get_min(input, axis_y),
-                                               &minimum) |
-                      touchscreen_get_prop_u32(dev, "touchscreen-size-y",
-                                               input_abs_get_max(input,
-                                                                 axis_y) + 1,
-                                               &maximum) |
-                      touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y",
-                                               input_abs_get_fuzz(input, axis_y),
-                                               &fuzz);
+                                               &minimum);
+       data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-y",
+                                                input_abs_get_max(input,
+                                                                  axis_y) + 1,
+                                                &maximum);
+       data_present |= touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y",
+                                                input_abs_get_fuzz(input, axis_y),
+                                                &fuzz);
        if (data_present)
                touchscreen_set_params(input, axis_y, minimum, maximum - 1, fuzz);
 
@@ -108,11 +108,11 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
        data_present = touchscreen_get_prop_u32(dev,
                                                "touchscreen-max-pressure",
                                                input_abs_get_max(input, axis),
-                                               &maximum) |
-                      touchscreen_get_prop_u32(dev,
-                                               "touchscreen-fuzz-pressure",
-                                               input_abs_get_fuzz(input, axis),
-                                               &fuzz);
+                                               &maximum);
+       data_present |= touchscreen_get_prop_u32(dev,
+                                                "touchscreen-fuzz-pressure",
+                                                input_abs_get_fuzz(input, axis),
+                                                &fuzz);
        if (data_present)
                touchscreen_set_params(input, axis, 0, maximum, fuzz);