printk: fix failure to return error in devkmsg_poll()

Error value got overwritten instantly. Signed-off-by: Nicolas Kaiser <[email protected]> Cc: Kay Sievers <[email protected]> Cc: Greg KH <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
kyagi · Apr 30, 2013 · 0a28531 · 0a28531
1 parent 1b2c289
commit 0a28531
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/kernel/printk.c b/kernel/printk.c
@@ -601,7 +601,8 @@ 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;
-		ret = POLLIN|POLLRDNORM;
+		else
+			ret = POLLIN|POLLRDNORM;
 	}
 	raw_spin_unlock_irq(&logbuf_lock);