projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/fix/amd', 'asoc/fix/hdmi-codec', 'asoc/fix/rt565...
[linux-2.6-microblaze.git]
/
drivers
/
s390
/
char
/
monreader.c
diff --git
a/drivers/s390/char/monreader.c
b/drivers/s390/char/monreader.c
index
956f662
..
7bc616b
100644
(file)
--- a/
drivers/s390/char/monreader.c
+++ b/
drivers/s390/char/monreader.c
@@
-435,9
+435,9
@@
static __poll_t mon_poll(struct file *filp, struct poll_table_struct *p)
poll_wait(filp, &mon_read_wait_queue, p);
if (unlikely(atomic_read(&monpriv->iucv_severed)))
poll_wait(filp, &mon_read_wait_queue, p);
if (unlikely(atomic_read(&monpriv->iucv_severed)))
- return POLLERR;
+ return
E
POLLERR;
if (atomic_read(&monpriv->read_ready))
if (atomic_read(&monpriv->read_ready))
- return
POLLIN |
POLLRDNORM;
+ return
EPOLLIN | E
POLLRDNORM;
return 0;
}
return 0;
}