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

Commit 0a285317 authored by Nicolas Kaiser's avatar Nicolas Kaiser Committed by Linus Torvalds
Browse files

printk: fix failure to return error in devkmsg_poll() 



Error value got overwritten instantly.

Signed-off-by: default avatarNicolas Kaiser <nikai@nikai.net>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1b2c289b

kernel/printk.c

+2 −1
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ static unsigned int devkmsg_poll(struct file *file, poll_table *wait) 
		/* return error when data has vanished underneath us */

		if (user->seq < log_first_seq)

			ret = POLLIN|POLLRDNORM|POLLERR|POLLPRI;

		else

			ret = POLLIN|POLLRDNORM;

	}

	raw_spin_unlock_irq(&logbuf_lock);