vfs: do bulk POLL* -> EPOLL* replacement

[linux-2.6-block.git] / drivers / media / usb / pvrusb2 / pvrusb2-v4l2.c

diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
index ad6290e1b6999615e8bb78c2212c9790ce59799b..9fdc57c1658fcc3d8dc028e126259255459c3f07 100644 (file)
--- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
@@ -1181,19 +1181,19 @@ static __poll_t pvr2_v4l2_poll(struct file *file, poll_table *wait)
        int ret;
 
        if (fh->fw_mode_flag) {
-               mask |= POLLIN | POLLRDNORM;
+               mask |= EPOLLIN | EPOLLRDNORM;
                return mask;
        }
 
        if (!fh->rhp) {
                ret = pvr2_v4l2_iosetup(fh);
-               if (ret) return POLLERR;
+               if (ret) return EPOLLERR;
        }
 
        poll_wait(file,&fh->wait_data,wait);
 
        if (pvr2_ioread_avail(fh->rhp) >= 0) {
-               mask |= POLLIN | POLLRDNORM;
+               mask |= EPOLLIN | EPOLLRDNORM;
        }
 
        return mask;