diff options
| author | Colin Cross <ccross@android.com> | 2011-01-21 19:10:44 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-21 19:10:44 -0800 |
| commit | 22b3c9ca22924cf7015ecadf7ce111cf402a707b (patch) | |
| tree | 53cdca7ceca92db51f4f8b920ab8bae690253e36 /drivers/input | |
| parent | ae80836c409a6986c1415e19472503f16670bae5 (diff) | |
| parent | 700df3ba934eccdd61429de0db8f664973719ed1 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/keyreset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyreset.c b/drivers/input/keyreset.c index a5091ac19bbe..36208fe0baae 100644 --- a/drivers/input/keyreset.c +++ b/drivers/input/keyreset.c @@ -88,10 +88,10 @@ static void keyreset_event(struct input_handle *handle, unsigned int type, state->restart_disabled = 1; if (restart_requested) panic("keyboard reset failed, %d", restart_requested); - pr_info("keyboard reset\n"); if (state->reset_fn) { restart_requested = state->reset_fn(); } else { + pr_info("keyboard reset\n"); schedule_work(&restart_work); restart_requested = 1; } |