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

Commit a6977d758fed ("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: a6977d758fed ("Input: synaptics-rmi4 - support bootloader v8 in f34v7")
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://lore.kernel.org/r/20220608124808.51402-2-matthias.schiffer@ew.tq-group.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/rmi4/rmi_f34.c b/drivers/input/rmi4/rmi_f34.c
index e5dca9868f87f3de65447c645ba66cc9638bc52d..3afc94f679edcdbe1b775d51f10eb377baef0f23 100644 (file)
--- a/drivers/input/rmi4/rmi_f34.c
+++ b/drivers/input/rmi4/rmi_f34.c
@@ -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);