Merge branch 'hv_netvsc-notification-and-namespace-fixes'

[linux-2.6-microblaze.git] / drivers / hid / hid-debug.c

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index c783fd5..4f4e7a0 100644 (file)
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -1185,9 +1185,9 @@ static __poll_t hid_debug_events_poll(struct file *file, poll_table *wait)
 
        poll_wait(file, &list->hdev->debug_wait, wait);
        if (list->head != list->tail)
-               return POLLIN | POLLRDNORM;
+               return EPOLLIN | EPOLLRDNORM;
        if (!list->hdev->debug)
-               return POLLERR | POLLHUP;
+               return EPOLLERR | EPOLLHUP;
        return 0;
 }