diff --git a/linux/alsa/alsa_driver.c b/linux/alsa/alsa_driver.c
index cf3b4620..04f7a777 100644
--- a/linux/alsa/alsa_driver.c
+++ b/linux/alsa/alsa_driver.c
@@ -900,7 +900,7 @@ alsa_driver_set_parameters (alsa_driver_t *driver,
 	driver->period_usecs =
 		(jack_time_t) floor ((((float) driver->frames_per_cycle) /
 				      driver->frame_rate) * 1000000.0f);
-	driver->poll_timeout = (int) floor (1.5f * driver->period_usecs);
+	driver->poll_timeout_ms = (int) floor (1.5f * (driver->period_usecs / 1000.0f));
 
 // JACK2
 /*
@@ -1362,7 +1362,7 @@ alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *status, float
 #ifdef __ANDROID__
 		poll_result = poll (driver->pfd, nfds, -1);  //fix for sleep issue
 #else
-		poll_result = poll (driver->pfd, nfds, driver->poll_timeout);
+		poll_result = poll (driver->pfd, nfds, driver->poll_timeout_ms);
 #endif
 		if (poll_result < 0) {
 
diff --git a/linux/alsa/alsa_driver.h b/linux/alsa/alsa_driver.h
index efe93de5..f01c08ea 100644
--- a/linux/alsa/alsa_driver.h
+++ b/linux/alsa/alsa_driver.h
@@ -58,7 +58,7 @@ typedef struct _alsa_driver {
 
     JACK_DRIVER_NT_DECL
 
-    int                           poll_timeout;
+    int                           poll_timeout_ms;
     jack_time_t                   poll_last;
     jack_time_t                   poll_next;
     char                        **playback_addr;