From aa3ae6b315d98c6e516f9cd9b084cdd18d68e019 Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Mon, 29 Apr 2013 16:17:20 -0700
Subject: [PATCH] --- yaml --- r: 365614 b: refs/heads/master c:
 0a285317daf785424c884d1a7548705c60bc42cc h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/printk.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d45add15ef49..82f6bfd9e4c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b2c289b4f9018f4bd54d22ab54aaeda9181cd2a
+refs/heads/master: 0a285317daf785424c884d1a7548705c60bc42cc
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 1c8ca176458f..376914e2869d 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/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);