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

Commit 98656d50 authored Sep 22, 2019 by Jiri Kosina

Merge branch 'for-5.4/hidraw-hiddev-epoll' into for-linus



- proper propagation of EPOLLOUT from hiddev and hidraw, from
  Fabian Henneke

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parents ad049d52 c801aff1

drivers/hid/hidraw.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ static __poll_t hidraw_poll(struct file file, poll_table wait)

		poll_wait(file, &list->hidraw->wait, wait);
		if (list->head != list->tail)
		return EPOLLIN \| EPOLLRDNORM;
		return EPOLLIN \| EPOLLRDNORM \| EPOLLOUT;
		if (!list->hidraw->exist)
		return EPOLLERR \| EPOLLHUP;
		return 0;

drivers/hid/usbhid/hiddev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -428,7 +428,7 @@ static __poll_t hiddev_poll(struct file file, poll_table wait)

		poll_wait(file, &list->hiddev->wait, wait);
		if (list->head != list->tail)
		return EPOLLIN \| EPOLLRDNORM;
		return EPOLLIN \| EPOLLRDNORM \| EPOLLOUT;
		if (!list->hiddev->exist)
		return EPOLLERR \| EPOLLHUP;
		return 0;