2013-04-08 10:30:50

by Nicolas Kaiser

[permalink] [raw]
Subject: [PATCH] printk: fix failure to return error in devkmsg_poll

Error value got overwritten instantly.

Signed-off-by: Nicolas Kaiser <[email protected]>
---
kernel/printk.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/printk.c b/kernel/printk.c
index abbdd9e..6317194 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -608,7 +608,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);

--
1.8.1.2