aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2019-04-26 17:22:01 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-04-26 17:35:32 -0700
commit3a349763cf11e63534b8f2d302f2d0c790566497 (patch)
treeafe88353fbb88a6cca322ae2b82320837b827566 /drivers/input
parentInput: synaptics-rmi4 - fix possible double free (diff)
downloadlinux-dev-3a349763cf11e63534b8f2d302f2d0c790566497.tar.xz
linux-dev-3a349763cf11e63534b8f2d302f2d0c790566497.zip
Input: synaptics-rmi4 - write config register values to the right offset
Currently any changed config register values don't take effect, as the function to write them back is called with the wrong register offset. Fixes: ff8f83708b3e (Input: synaptics-rmi4 - add support for 2D sensors and F11) Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/rmi4/rmi_f11.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
index df64d6aed4f7..93901ebd122a 100644
--- a/drivers/input/rmi4/rmi_f11.c
+++ b/drivers/input/rmi4/rmi_f11.c
@@ -1230,7 +1230,7 @@ static int rmi_f11_initialize(struct rmi_function *fn)
}
rc = f11_write_control_regs(fn, &f11->sens_query,
- &f11->dev_controls, fn->fd.query_base_addr);
+ &f11->dev_controls, fn->fd.control_base_addr);
if (rc)
dev_warn(&fn->dev, "Failed to write control registers\n");