summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-08-22 13:25:56 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-07 08:30:00 +0200
commitfb21f6365c7bd0d6ba5d1889194be3b966f34aaf (patch)
tree2c37118023809bd0bf8a7b05e7dd92d35bfbc4c8
parentccb081376fec96f6203f2faeda1bc5e365883322 (diff)
downloadlinux-fb21f6365c7bd0d6ba5d1889194be3b966f34aaf.tar.gz
linux-fb21f6365c7bd0d6ba5d1889194be3b966f34aaf.tar.bz2
linux-fb21f6365c7bd0d6ba5d1889194be3b966f34aaf.zip
Input: tegra-kbc - fix inverted reset logic
commit fae16989be77b09bab86c79233e4b511ea769cea upstream. Commit fe6b0dfaba68 ("Input: tegra-kbc - use reset framework") accidentally converted _deassert to _assert, so there is no code to wake up this hardware. Fixes: fe6b0dfaba68 ("Input: tegra-kbc - use reset framework") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Thierry Reding <treding@nvidia.com> Acked-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/keyboard/tegra-kbc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 9757a58bc897..5d39b966dd28 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);