From abad7d44f05e269b373da2c62d22b451a4206929 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@cmpxchg.org>
Date: Tue, 10 Mar 2009 22:44:01 +0100
Subject: [PATCH] --- yaml --- r: 132487 b: refs/heads/master c:
 96fe2ab830d7dffee1b3d8abf27ced4d7d5765e7 h: refs/heads/master i:   132485:
 4cdc7d75921fe3a00f654a0c390adcb840425598   132483:
 f9f93ec6c331498569fd0ab56c8f1b86eeca48eb   132479:
 224ea0821678bc6b51eef40789b38aa3efb26039 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/hid/usbhid/hiddev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2b9595cc36f3..edc56a74a86f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48e7a3c95c9f98c2cb6f894820e3cc2d0448e92f
+refs/heads/master: 96fe2ab830d7dffee1b3d8abf27ced4d7d5765e7
diff --git a/trunk/drivers/hid/usbhid/hiddev.c b/trunk/drivers/hid/usbhid/hiddev.c
index 00ea1ed282a9..1f5b5d4c3c34 100644
--- a/trunk/drivers/hid/usbhid/hiddev.c
+++ b/trunk/drivers/hid/usbhid/hiddev.c
@@ -323,7 +323,7 @@ static ssize_t hiddev_write(struct file * file, const char __user * buffer, size
  */
 static ssize_t hiddev_read(struct file * file, char __user * buffer, size_t count, loff_t *ppos)
 {
-	DECLARE_WAITQUEUE(wait, current);
+	DEFINE_WAIT(wait);
 	struct hiddev_list *list = file->private_data;
 	int event_size;
 	int retval;