diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-27 16:27:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-27 16:27:02 -0700 |
| commit | 25cce03b1d06e4b742f6dafdda2f4d80c13bdc18 (patch) | |
| tree | e6698796fe1063223bbdb413d4a1314162edcab3 /drivers/input/rmi4/rmi_f11.c | |
| parent | 037904a22bf8b2c999a6e2a8ba971b549c1e9600 (diff) | |
| parent | 3a349763cf11e63534b8f2d302f2d0c790566497 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Just a couple of fixups for Synaptics RMI4 driver and allowing
snvs_pwrkey to be selected on more boards"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - write config register values to the right offset
Input: synaptics-rmi4 - fix possible double free
Input: snvs_pwrkey - make it depend on ARCH_MXC
Diffstat (limited to 'drivers/input/rmi4/rmi_f11.c')
| -rw-r--r-- | drivers/input/rmi4/rmi_f11.c | 2 |
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"); |