---

yaml --- r: 365614 b: refs/heads/master c: 0a28531 h: refs/heads/master v: v3
git-mirror · Apr 30, 2013 · aa3ae6b · aa3ae6b
1 parent 0d75e13
commit aa3ae6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);