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
/
media
/
usb
/
stkwebcam
/
stk-webcam.c
diff --git
a/drivers/media/usb/stkwebcam/stk-webcam.c
b/drivers/media/usb/stkwebcam/stk-webcam.c
index 17ad978c01726fc801c24c05199cbdfa792e95b2..22389b56ec24664e2df6e3ed412348941f4035c5 100644
(file)
--- a/
drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/
drivers/media/usb/stkwebcam/stk-webcam.c
@@
-729,10
+729,10
@@
static __poll_t v4l_stk_poll(struct file *fp, poll_table *wait)
poll_wait(fp, &dev->wait_frame, wait);
if (!is_present(dev))
- return POLLERR;
+ return
E
POLLERR;
if (!list_empty(&dev->sio_full))
- return res |
POLLIN |
POLLRDNORM;
+ return res |
EPOLLIN | E
POLLRDNORM;
return res;
}