Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3c8e93f authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina
Browse files

HID: wacom - return ENODEV for failed wacom_setup_pad_input_capabilities 



ENODEV indicates no device is added. Hence, the associated pad input device
is simply freed.

Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent fefb391f

drivers/hid/wacom_wac.c

+3 −3
Original line number Diff line number Diff line
@@ -2405,7 +2405,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 
	case INTUOSPS:

		/* touch interface does not have the pad device */

		if (features->device_type != BTN_TOOL_PEN)

			return 1;

			return -ENODEV;



		for (i = 0; i < 7; i++)

			__set_bit(BTN_0 + i, input_dev->keybit);
@@ -2450,7 +2450,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 
	case BAMBOO_PT:

		/* pad device is on the touch interface */

		if (features->device_type != BTN_TOOL_FINGER)

			return 1;

			return -ENODEV;



		__clear_bit(ABS_MISC, input_dev->absbit);
@@ -2463,7 +2463,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 


	default:

		/* no pad supported */

		return 1;

		return -ENODEV;

	}

	return 0;

}