diff options
| author |   Nicolas Kaiser <nikai@nikai.net> | 2013-04-29 16:17:20 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 18:28:14 -0700 |
| commit | 0a285317daf785424c884d1a7548705c60bc42cc (patch) | |
| tree | 196895c36f8252f84bbc6b3b6d776f656267d5a0 /kernel/printk.c | |
| parent | include/linux/printk.h: include stdarg.h (diff) | |
| download | linux-dev-0a285317daf785424c884d1a7548705c60bc42cc.tar.xz linux-dev-0a285317daf785424c884d1a7548705c60bc42cc.zip | |
printk: fix failure to return error in devkmsg_poll()
Error value got overwritten instantly.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/printk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 1c8ca176458f..376914e2869d 100644 --- 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); |