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

Commit 7611e8d2 authored by Founder Fang's avatar Founder Fang Committed by Jiri Kosina
Browse files

HID: hidraw: fix nonblock read return EAGAIN after device removed 



When nonblock read the condition check (file->f_flags & O_NONBLOCK) always be
true, signal_pending and device exist checking never get a chance to run, so
the user mode code always get EAGAIN even if device removed. move nonblock mode
checking to the last can fix this problem.

Signed-off-by: default avatarFounder Fang <founder.fang@gmail.com>
Reviewed-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 1a1e8c6f

drivers/hid/hidraw.c

+4 −4
Original line number Diff line number Diff line
@@ -57,10 +57,6 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count, 
			set_current_state(TASK_INTERRUPTIBLE);



			while (list->head == list->tail) {

				if (file->f_flags & O_NONBLOCK) {

					ret = -EAGAIN;

					break;

				}

				if (signal_pending(current)) {

					ret = -ERESTARTSYS;

					break;
@@ -69,6 +65,10 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count, 
					ret = -EIO;

					break;

				}

				if (file->f_flags & O_NONBLOCK) {

					ret = -EAGAIN;

					break;

				}



				/* allow O_NONBLOCK to work well from other threads */

				mutex_unlock(&list->read_mutex);