Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[thirdparty/kernel/stable.git] / drivers / input / rmi4 / rmi_f30.c

diff --git a/drivers/input/rmi4/rmi_f30.c b/drivers/input/rmi4/rmi_f30.c
index b8572b342dcb138d0119f78e9c9f82850effd740..34dfee555b201b0577e6e5fc0c58c63e7cc8cac7 100644 (file)
--- a/drivers/input/rmi4/rmi_f30.c
+++ b/drivers/input/rmi4/rmi_f30.c
@@ -262,9 +262,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;