--- a/lib/autofs.c
+++ b/lib/autofs.c
@@ -140,6 +140,7 @@ static int fullread(void *ptr, size_t le
 
 static int autofs_in(union autofs_v5_packet_union *pkt)
 {
+	int res;
 	struct pollfd fds[1];
 
 	fds[0].fd = fdout;
@@ -147,15 +148,19 @@ static int autofs_in(union autofs_v5_pac
 
 	while(1)
 	{
-		if(poll(fds, 2, 1000) == -1)
+		res = poll(fds, 1, -1);
+
+		if (res == -1)
 		{
 			if (errno == EINTR)
 				continue;
 			log_printf("failed while trying to read packet from kernel\n");
 			return -1;
 		}
-		if(fds[0].revents & POLLIN)
+		else if ((res > 0) && (fds[0].revents & POLLIN))
+		{
 			return fullread(pkt, sizeof(*pkt));
+		}
 	}
 }
 
