git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vfs: do bulk POLL* -> EPOLL* replacement
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
comedi
/
drivers
/
serial2002.c
diff --git
a/drivers/staging/comedi/drivers/serial2002.c
b/drivers/staging/comedi/drivers/serial2002.c
index ab69eeb2c1f18d5eded92a1e956c5a449922d34f..b3f3b4a201af15e98aef01f3a8ff294566273c7d 100644
(file)
--- a/
drivers/staging/comedi/drivers/serial2002.c
+++ b/
drivers/staging/comedi/drivers/serial2002.c
@@
-114,8
+114,8
@@
static void serial2002_tty_read_poll_wait(struct file *f, int timeout)
__poll_t mask;
mask = f->f_op->poll(f, &table.pt);
- if (mask & (
POLLRDNORM | POLLRDBAND |
POLLIN |
-
POLLHUP |
POLLERR)) {
+ if (mask & (
EPOLLRDNORM | EPOLLRDBAND | E
POLLIN |
+
EPOLLHUP | E
POLLERR)) {
break;
}
now = ktime_get();