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
/
usb
/
class
/
usbtmc.c
diff --git
a/drivers/usb/class/usbtmc.c
b/drivers/usb/class/usbtmc.c
index 7ea67a55be103804c026889cd1275492de955fa5..bdb1de0c0cef6f41bf9b9e982608d0f48b62da07 100644
(file)
--- a/
drivers/usb/class/usbtmc.c
+++ b/
drivers/usb/class/usbtmc.c
@@
-1265,13
+1265,13
@@
static __poll_t usbtmc_poll(struct file *file, poll_table *wait)
mutex_lock(&data->io_mutex);
if (data->zombie) {
mutex_lock(&data->io_mutex);
if (data->zombie) {
- mask =
POLLHUP |
POLLERR;
+ mask =
EPOLLHUP | E
POLLERR;
goto no_poll;
}
poll_wait(file, &data->waitq, wait);
goto no_poll;
}
poll_wait(file, &data->waitq, wait);
- mask = (atomic_read(&data->srq_asserted)) ?
POLLIN |
POLLRDNORM : 0;
+ mask = (atomic_read(&data->srq_asserted)) ?
EPOLLIN | E
POLLRDNORM : 0;
no_poll:
mutex_unlock(&data->io_mutex);
no_poll:
mutex_unlock(&data->io_mutex);