diff options
| author | Gary King <GKing@nvidia.com> | 2010-02-03 12:02:07 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master-01.nvidia.com> | 2010-02-03 12:02:07 -0800 |
| commit | b07521cfd65d52ed1ee398149e134361eae3988c (patch) | |
| tree | 95fe5dcfafb832711125a3a1cfff0534aaa624cc /drivers | |
| parent | 9671c5019de83722293cee2b9459e09877f4cbd2 (diff) | |
| parent | c1418ca4de11cb222fe531f383dc6025aba3f10e (diff) | |
Merge "tegra: tegra-nvec (keyboard) driver thread added into freezable state" into android-tegra-2.6.29
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/keyboard/tegra-nvec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/input/keyboard/tegra-nvec.c b/drivers/input/keyboard/tegra-nvec.c index df6f2e27ca20..8c6679994648 100644 --- a/drivers/input/keyboard/tegra-nvec.c +++ b/drivers/input/keyboard/tegra-nvec.c @@ -26,6 +26,7 @@ #include <linux/platform_device.h> #include <linux/kthread.h> #include <linux/tegra_devices.h> +#include <linux/freezer.h> #include "nvos.h" #include "nvec.h" @@ -268,6 +269,10 @@ static int nvec_keyboard_recv(void *arg) struct input_dev *input_dev = (struct input_dev *)arg; struct nvec_keyboard *keyboard = input_get_drvdata(input_dev); + /* keyboard event thread should be frozen before suspending the + * keyboard and NVEC drivers */ + set_freezable_with_signal(); + while (!keyboard->shutdown) { unsigned int pressed; NvU32 code; |