projects
/
linux-2.6-block.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
[linux-2.6-block.git]
/
sound
/
oss
/
dmasound
/
dmasound_core.c
diff --git
a/sound/oss/dmasound/dmasound_core.c
b/sound/oss/dmasound/dmasound_core.c
index 6b57f8aac1b700c621768dbf202b9d8b786fdc9f..8c0f8a9ee0baef5bd42961742b91b50356f90bbb 100644
(file)
--- a/
sound/oss/dmasound/dmasound_core.c
+++ b/
sound/oss/dmasound/dmasound_core.c
@@
-684,7
+684,7
@@
static __poll_t sq_poll(struct file *file, struct poll_table_struct *wait)
poll_wait(file, &write_sq.action_queue, wait);
if (file->f_mode & FMODE_WRITE)
if (write_sq.count < write_sq.max_active || write_sq.block_size - write_sq.rear_size > 0)
- mask |=
POLLOUT |
POLLWRNORM;
+ mask |=
EPOLLOUT | E
POLLWRNORM;
return mask;
}