Commit 2de01e0e authored by Nikita Travkin's avatar Nikita Travkin Committed by Dmitry Torokhov
Browse files

Input: zinitix - don't fail if linux,keycodes prop is absent 



When initially adding the touchkey support, a mistake was made in the
property parsing code. The possible negative errno from
device_property_count_u32() was never checked, which was an oversight
left from converting to it from the of_property as part of the review
fixes.

Re-add the correct handling of the absent property, in which case zero
touchkeys should be assumed, which would disable the feature.

Reported-by: default avatarJakob Hauser <jahau@rocketmail.com>
Tested-by: default avatarJakob Hauser <jahau@rocketmail.com>
Fixes: 075d9b22 ("Input: zinitix - add touchkey support")
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarNikita Travkin <nikita@trvn.ru>
Tested-by: default avatarYassine Oudjana <y.oudjana@protonmail.com>
Link: https://lore.kernel.org/r/20241004-zinitix-no-keycodes-v2-1-876dc9fea4b6@trvn.ru


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 22a18935

drivers/input/touchscreen/zinitix.c

+22 −12
Original line number Diff line number Diff line
@@ -645,20 +645,30 @@ static int zinitix_ts_probe(struct i2c_client *client) 
		return error;

	}



	bt541->num_keycodes = device_property_count_u32(&client->dev, "linux,keycodes");

	if (bt541->num_keycodes > ARRAY_SIZE(bt541->keycodes)) {

		dev_err(&client->dev, "too many keys defined (%d)\n", bt541->num_keycodes);

	if (device_property_present(&client->dev, "linux,keycodes")) {

		bt541->num_keycodes = device_property_count_u32(&client->dev,

								"linux,keycodes");

		if (bt541->num_keycodes < 0) {

			dev_err(&client->dev, "Failed to count keys (%d)\n",

				bt541->num_keycodes);

			return bt541->num_keycodes;

		} else if (bt541->num_keycodes > ARRAY_SIZE(bt541->keycodes)) {

			dev_err(&client->dev, "Too many keys defined (%d)\n",

				bt541->num_keycodes);

			return -EINVAL;

		}



	error = device_property_read_u32_array(&client->dev, "linux,keycodes",

		error = device_property_read_u32_array(&client->dev,

						       "linux,keycodes",

						       bt541->keycodes,

						       bt541->num_keycodes);

		if (error) {

			dev_err(&client->dev,

			"Unable to parse \"linux,keycodes\" property: %d\n", error);

				"Unable to parse \"linux,keycodes\" property: %d\n",

				error);

			return error;

		}

	}



	error = zinitix_init_input_dev(bt541);

	if (error) {