1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/input/rmi4/rmi_f30.c b/drivers/input/rmi4/rmi_f30.c
index 3422464af229..198678613382 100644
--- a/drivers/input/rmi4/rmi_f30.c
+++ b/drivers/input/rmi4/rmi_f30.c
@@ -258,9 +258,10 @@ static int rmi_f30_map_gpios(struct rmi_function *fn,
 
         /*
          * Buttonpad could be also inferred from f30->has_mech_mouse_btns,
-         * but I am not sure, so use only the pdata info.
+         * but I am not sure, so use only the pdata info and the number of
+         * mapped buttons.
          */
-        if (pdata->f30_data.buttonpad)
+        if (pdata->f30_data.buttonpad || (button - BTN_LEFT == 1))
                 __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
 
         return 0;