X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fusb%2Fclass%2Fusbtmc.c;h=bdb1de0c0cef6f41bf9b9e982608d0f48b62da07;hb=a9a08845e9acbd224e4ee466f5c1275ed50054e8;hp=7ea67a55be103804c026889cd1275492de955fa5;hpb=3dbc4f548519f9882676843b4fcdb4e61668baf8;p=sfrench%2Fcifs-2.6.git

diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 7ea67a55be10..bdb1de0c0cef 100644
--- 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) {
-		mask = POLLHUP | POLLERR;
+		mask = EPOLLHUP | EPOLLERR;
 		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 | EPOLLRDNORM : 0;
 
 no_poll:
 	mutex_unlock(&data->io_mutex);