diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-26 18:36:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-26 18:36:23 -0700 |
| commit | b09c412aa4540d13b677a9f4af05f59048b78949 (patch) | |
| tree | 8ee5d9e81967da66d615cc07a54adf43e56e9630 /drivers/input/keyboard | |
| parent | 219c04cea3f17a6e3ab11d257af741f527c16195 (diff) | |
| parent | e3a888a4bff0bef0b256d55c58bc32c99fb44ece (diff) | |
| download | talos-op-linux-b09c412aa4540d13b677a9f4af05f59048b78949.tar.gz talos-op-linux-b09c412aa4540d13b677a9f4af05f59048b78949.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov:
"Simply small driver fixups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ads7846 - remove redundant regulator_disable call
Input: synaptics-rmi4 - fix register descriptor subpacket map construction
Input: tegra-kbc - fix inverted reset logic
Input: silead - use devm_gpiod_get
Input: i8042 - set up shared ps2_cmd_mutex for AUX ports
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/tegra-kbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index 7d61439be5f2..0c07e1023a46 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c @@ -376,7 +376,7 @@ static int tegra_kbc_start(struct tegra_kbc *kbc) /* Reset the KBC controller to clear all previous status.*/ reset_control_assert(kbc->rst); udelay(100); - reset_control_assert(kbc->rst); + reset_control_deassert(kbc->rst); udelay(100); tegra_kbc_config_pins(kbc); |
