aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/evdev.c
diff options
context:
space:
mode:
authorMike Chan <mike@android.com>2009-10-27 17:37:44 -0700
committerColin Cross <ccross@android.com>2011-06-14 09:08:45 -0700
commit2a1f352ace48145fa07a7d5086ad23c3f9e5947e (patch)
treeb641eacb579bbdaeefaece23abad9b468066168f /drivers/input/evdev.c
parent5d61887ea1837592ecbe3f5af7b7e4a741b659c5 (diff)
input: evdev: Use unique wakelock names
wakelock names are now contain evdev->name and pid Signed-off-by: Mike Chan <mike@android.com>
Diffstat (limited to 'drivers/input/evdev.c')
-rw-r--r--drivers/input/evdev.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 809ebebf4d1..1848c9e5633 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -45,6 +45,7 @@ struct evdev_client {
unsigned int packet_head; /* [future] position of the first element of next packet */
spinlock_t buffer_lock; /* protects access to buffer, head and tail */
struct wake_lock wake_lock;
+ char name[28];
struct fasync_struct *fasync;
struct evdev *evdev;
struct list_head node;
@@ -312,7 +313,9 @@ 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");
+ snprintf(client->name, sizeof(client->name), "%s-%d",
+ dev_name(&evdev->dev), task_tgid_vnr(current));
+ wake_lock_init(&client->wake_lock, WAKE_LOCK_SUSPEND, client->name);
client->evdev = evdev;
evdev_attach_client(evdev, client);