vfs: do bulk POLL* -> EPOLL* replacement

[linux-2.6-microblaze.git] / drivers / usb / core / devio.c

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 5e72bf3..d526595 100644 (file)
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1681,8 +1681,6 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
                u |= URB_ISO_ASAP;
        if (uurb->flags & USBDEVFS_URB_SHORT_NOT_OK && is_in)
                u |= URB_SHORT_NOT_OK;
-       if (uurb->flags & USBDEVFS_URB_NO_FSBR)
-               u |= URB_NO_FSBR;
        if (uurb->flags & USBDEVFS_URB_ZERO_PACKET)
                u |= URB_ZERO_PACKET;
        if (uurb->flags & USBDEVFS_URB_NO_INTERRUPT)
@@ -2580,11 +2578,11 @@ static __poll_t usbdev_poll(struct file *file,
 
        poll_wait(file, &ps->wait, wait);
        if (file->f_mode & FMODE_WRITE && !list_empty(&ps->async_completed))
-               mask |= POLLOUT | POLLWRNORM;
+               mask |= EPOLLOUT | EPOLLWRNORM;
        if (!connected(ps))
-               mask |= POLLHUP;
+               mask |= EPOLLHUP;
        if (list_empty(&ps->list))
-               mask |= POLLERR;
+               mask |= EPOLLERR;
        return mask;
 }