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

Commit e4add7b6 authored by Andrew Duggan's avatar Andrew Duggan Committed by Dmitry Torokhov
Browse files

Input: synaptics-rmi4 - fix maximum size check for F12 control register 8 



According to the RMI4 spec the maximum size of F12 control register 8 is
15 bytes. The current code incorrectly reports an error if control 8 is
greater then 14. Making sensors with a control register 8 with 15 bytes
unusable.

Signed-off-by: default avatarAndrew Duggan <aduggan@synaptics.com>
Reported-by: default avatarChris Healy <cphealy@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 6a5029e6

drivers/input/rmi4/rmi_f12.c

+5 −4
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12) 
	struct rmi_device *rmi_dev = fn->rmi_dev;

	int ret;

	int offset;

	u8 buf[14];

	u8 buf[15];

	int pitch_x = 0;

	int pitch_y = 0;

	int clip_x_low = 0;
@@ -86,9 +86,10 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12) 


	offset = rmi_register_desc_calc_reg_offset(&f12->control_reg_desc, 8);



	if (item->reg_size > 14) {

		dev_err(&fn->dev, "F12 control8 should be 14 bytes, not: %ld\n",

			item->reg_size);

	if (item->reg_size > sizeof(buf)) {

		dev_err(&fn->dev,

			"F12 control8 should be no bigger than %zd bytes, not: %ld\n",

			sizeof(buf), item->reg_size);

		return -ENODEV;

	}