Commit ac61145a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid 

Pull HID fix from Jiri Kosina:
 "A regression fix for EPOLLOUT handling in hidraw and uhid"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: hidraw, uhid: Always report EPOLLOUT
parents 213356fe 9e635c28

drivers/hid/hidraw.c

+4 −3
Original line number Diff line number Diff line
@@ -249,13 +249,14 @@ static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_t 
static __poll_t hidraw_poll(struct file *file, poll_table *wait)

{

	struct hidraw_list *list = file->private_data;

	__poll_t mask = EPOLLOUT | EPOLLWRNORM; /* hidraw is always writable */



	poll_wait(file, &list->hidraw->wait, wait);

	if (list->head != list->tail)

		return EPOLLIN | EPOLLRDNORM;

		mask |= EPOLLIN | EPOLLRDNORM;

	if (!list->hidraw->exist)

		return EPOLLERR | EPOLLHUP;

	return EPOLLOUT | EPOLLWRNORM;

		mask |= EPOLLERR | EPOLLHUP;

	return mask;

}



static int hidraw_open(struct inode *inode, struct file *file)

drivers/hid/uhid.c

+3 −2
Original line number Diff line number Diff line
@@ -766,13 +766,14 @@ static ssize_t uhid_char_write(struct file *file, const char __user *buffer, 
static __poll_t uhid_char_poll(struct file *file, poll_table *wait)

{

	struct uhid_device *uhid = file->private_data;

	__poll_t mask = EPOLLOUT | EPOLLWRNORM; /* uhid is always writable */



	poll_wait(file, &uhid->waitq, wait);



	if (uhid->head != uhid->tail)

		return EPOLLIN | EPOLLRDNORM;

		mask |= EPOLLIN | EPOLLRDNORM;



	return EPOLLOUT | EPOLLWRNORM;

	return mask;

}



static const struct file_operations uhid_fops = {