diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-19 14:50:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-19 14:50:15 -0700 |
| commit | 2d8620cb880c796c9a9b59fe8d4ff37d726acfea (patch) | |
| tree | 28ec4a32732c76bb7395c9a3d99f2c70c409b013 | |
| parent | fe2fd6cc346cc7199a52250e8fb594852b2a321b (diff) | |
| parent | 96fe2ab830d7dffee1b3d8abf27ced4d7d5765e7 (diff) | |
| download | kernel-common-2d8620cb880c796c9a9b59fe8d4ff37d726acfea.tar.gz kernel-common-2d8620cb880c796c9a9b59fe8d4ff37d726acfea.tar.bz2 kernel-common-2d8620cb880c796c9a9b59fe8d4ff37d726acfea.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: fix waitqueue usage in hiddev
HID: fix incorrect free in hiddev
| -rw-r--r-- | drivers/hid/usbhid/hiddev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 4940e4d70c2d..1f5b5d4c3c34 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -306,7 +306,7 @@ static int hiddev_open(struct inode *inode, struct file *file) return 0; bail: file->private_data = NULL; - kfree(list->hiddev); + kfree(list); return res; } @@ -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; |