[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20130408121858.70d2e601@absol.kitzblitz>
Date: Mon, 8 Apr 2013 12:18:58 +0200
From: Nicolas Kaiser <nikai@...ai.net>
To: Kay Sievers <kay@...y.org>
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] printk: fix failure to return error in devkmsg_poll
Error value got overwritten instantly.
Signed-off-by: Nicolas Kaiser <nikai@...ai.net>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists