summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2008-10-17 15:20:55 -0700
committerColin Cross <ccross@android.com>2010-09-29 17:49:09 -0700
commit7a1d4b001f18ce69d8037b3cf25e6a10eb113541 (patch)
tree4f7839c806c9ad470c8ed8b70fa1e0a83e1ca3d3 /drivers/input
parent9ad323ee4520876097403183bdb595858e0a20d2 (diff)
Input: Hold wake lock while event queue is not empty.
Allows userspace code to process input events while the device appears to be asleep. Signed-off-by: Arve Hjønnevåg <arve@android.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/evdev.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index c908c5f83645..98bb5be0a6d1 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -21,6 +21,7 @@
#include <linux/input.h>
#include <linux/major.h>
#include <linux/device.h>
+#include <linux/wakelock.h>
#include "input-compat.h"
struct evdev {
@@ -40,6 +41,7 @@ struct evdev_client {
int head;
int tail;
spinlock_t buffer_lock; /* protects access to buffer, head and tail */
+ struct wake_lock wake_lock;
struct fasync_struct *fasync;
struct evdev *evdev;
struct list_head node;
@@ -59,6 +61,7 @@ static void evdev_pass_event(struct evdev_client *client,
* "empty" by having client->head == client->tail.
*/
spin_lock(&client->buffer_lock);
+ wake_lock_timeout(&client->wake_lock, 5 * HZ);
do {
client->buffer[client->head++] = *event;
client->head &= client->bufsize - 1;
@@ -240,6 +243,7 @@ static int evdev_release(struct inode *inode, struct file *file)
mutex_unlock(&evdev->mutex);
evdev_detach_client(evdev, client);
+ wake_lock_destroy(&client->wake_lock);
kfree(client);
evdev_close_device(evdev);
@@ -291,6 +295,7 @@ static int evdev_open(struct inode *inode, struct file *file)
client->bufsize = bufsize;
spin_lock_init(&client->buffer_lock);
+ wake_lock_init(&client->wake_lock, WAKE_LOCK_SUSPEND, "evdev");
client->evdev = evdev;
evdev_attach_client(evdev, client);
@@ -356,6 +361,8 @@ static int evdev_fetch_next_event(struct evdev_client *client,
if (have_event) {
*event = client->buffer[client->tail++];
client->tail &= client->bufsize - 1;
+ if (client->head == client->tail)
+ wake_unlock(&client->wake_lock);
}
spin_unlock_irq(&client->buffer_lock);