Commit 28f677e9 authored by Matthias Schiffer's avatar Matthias Schiffer Committed by Dmitry Torokhov
Browse files

Input: synaptics-rmi4 - fix firmware update operations with bootloader v8 



Commit a6977d75 ("Input: synaptics-rmi4 - support bootloader v8 in
f34v7") allowed the F34v7 driver to probe with bootloader v8, but it did
not update various other bootloader version checks in the F34 code.

Fixes: a6977d75 ("Input: synaptics-rmi4 - support bootloader v8 in f34v7")
Signed-off-by: default avatarMatthias Schiffer <matthias.schiffer@ew.tq-group.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://lore.kernel.org/r/20220608124808.51402-2-matthias.schiffer@ew.tq-group.com


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

drivers/input/rmi4/rmi_f34.c

+3 −3
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int rmi_firmware_update(struct rmi_driver_data *data, 


	f34 = dev_get_drvdata(&data->f34_container->dev);



	if (f34->bl_version == 7) {

	if (f34->bl_version >= 7) {

		if (data->pdt_props & HAS_BSR) {

			dev_err(dev, "%s: LTS not supported\n", __func__);

			return -ENODEV;
@@ -382,7 +382,7 @@ static int rmi_firmware_update(struct rmi_driver_data *data, 
	}



	/* Enter flash mode */

	if (f34->bl_version == 7)

	if (f34->bl_version >= 7)

		ret = rmi_f34v7_start_reflash(f34, fw);

	else

		ret = rmi_f34_enable_flash(f34);
@@ -413,7 +413,7 @@ static int rmi_firmware_update(struct rmi_driver_data *data, 
	f34 = dev_get_drvdata(&data->f34_container->dev);



	/* Perform firmware update */

	if (f34->bl_version == 7)

	if (f34->bl_version >= 7)

		ret = rmi_f34v7_do_reflash(f34, fw);

	else

		ret = rmi_f34_update_firmware(f34, fw);