Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
parents fe2fd6cc 96fe2ab8

drivers/hid/usbhid/hiddev.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -306,7 +306,7 @@ static int hiddev_open(struct inode *inode, struct file *file) 
	return 0;

	return 0;

bail:

bail:

	file->private_data = NULL;

	file->private_data = NULL;

	kfree(list->hiddev);

	kfree(list);

	return res;

	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)

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;

	struct hiddev_list *list = file->private_data;

	int event_size;

	int event_size;

	int retval;

	int retval;