Commit 2d8620cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://

* 'for-linus' of git://
  HID: fix waitqueue usage in hiddev
  HID: fix incorrect free in hiddev
parents fe2fd6cc 96fe2ab8
......@@ -306,7 +306,7 @@ static int hiddev_open(struct inode *inode, struct file *file)
return 0;
file->private_data = NULL;
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);
struct hiddev_list *list = file->private_data;
int event_size;
int retval;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment