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]
/
drivers
/
firewire
/
nosy.c
diff --git
a/drivers/firewire/nosy.c
b/drivers/firewire/nosy.c
index fee2e9e7ea20a8adb1d82e108a7ee96ff984842a..a128dd1126ae458c323d7ca6a43293bef05dd14f 100644
(file)
--- a/
drivers/firewire/nosy.c
+++ b/
drivers/firewire/nosy.c
@@
-337,10
+337,10
@@
nosy_poll(struct file *file, poll_table *pt)
poll_wait(file, &client->buffer.wait, pt);
if (atomic_read(&client->buffer.size) > 0)
- ret =
POLLIN |
POLLRDNORM;
+ ret =
EPOLLIN | E
POLLRDNORM;
if (list_empty(&client->lynx->link))
- ret |= POLLHUP;
+ ret |=
E
POLLHUP;
return ret;
}