Commit 3f9ed5c2 authored Feb 28, 2022 by Hans de Goede Committed by Dmitry Torokhov Feb 28, 2022

Input: set EV_ABS in dev->evbit even if input_alloc_absinfo() fails



The input core's error handling for input_alloc_absinfo() failures
is based on ignoring the error until input_register_device() runs
and then checks for the failure like this:

        if (test_bit(EV_ABS, dev->evbit) && !dev->absinfo) {
                dev_err(&dev->dev, ...);
                return -EINVAL;
        }

This relies on EV_ABS actually getting set in dev->evbit even
if input_alloc_absinfo() fails, change input_set_abs_params() and
input_set_capability() to actually adhere to this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220131143539.109142-1-hdegoede@redhat.com


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

parent 986c6f7c

drivers/input/input.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -511,6 +511,9 @@ void input_set_abs_params(struct input_dev *dev, unsigned int axis,
		{
		struct input_absinfo *absinfo;

		__set_bit(EV_ABS, dev->evbit);
		__set_bit(axis, dev->absbit);

		input_alloc_absinfo(dev);
		if (!dev->absinfo)
		return;
		@@ -520,9 +523,6 @@ void input_set_abs_params(struct input_dev *dev, unsigned int axis,
		absinfo->maximum = max;
		absinfo->fuzz = fuzz;
		absinfo->flat = flat;

		__set_bit(EV_ABS, dev->evbit);
		__set_bit(axis, dev->absbit);
		}
		EXPORT_SYMBOL(input_set_abs_params);

		@@ -2085,9 +2085,6 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int

		case EV_ABS:
		input_alloc_absinfo(dev);
		if (!dev->absinfo)
		return;

		__set_bit(code, dev->absbit);
		break;