diff options
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/evdev.c | 1 | ||||
| -rw-r--r-- | drivers/input/keyreset.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 7d22f51392dd..43e94e5188dd 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -316,6 +316,7 @@ static int evdev_open(struct inode *inode, struct file *file) err_free_client: evdev_detach_client(evdev, client); + wake_lock_destroy(&client->wake_lock); kfree(client); err_put_evdev: put_device(&evdev->dev); 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; } |