diff --git a/miniaudio.h b/miniaudio.h
index eaf608c0..23002564 100644
--- a/miniaudio.h
+++ b/miniaudio.h
@@ -39701,8 +39701,11 @@ static ma_result ma_device_step__oss(ma_device* pDevice, ma_blocking_mode blocki
     ma_device_type deviceType = ma_device_get_type(pDevice);
     struct timeval tv;
     struct timeval* pTimeout = NULL;
-    fd_set fds;
+    fd_set fdsRead;
+    fd_set fdsWrite;
+    int fdMax;
     ma_result result;
+    int selectResult;
 
     if (blockingMode == MA_BLOCKING_MODE_NON_BLOCKING) {
         tv.tv_sec  = 0;
@@ -39710,22 +39713,34 @@ static ma_result ma_device_step__oss(ma_device* pDevice, ma_blocking_mode blocki
         pTimeout = &tv;
     }
 
-    if (deviceType == ma_device_type_capture || deviceType == ma_device_type_duplex) {
-        int retval;
+    do
+    {
+        FD_ZERO(&fdsRead);
+        FD_ZERO(&fdsWrite);
 
-        do
-        {
-            FD_ZERO(&fds);
-            FD_SET(pDeviceStateOSS->fdCapture, &fds);
+        fdMax = 0;
 
-            retval = select(pDeviceStateOSS->fdCapture + 1, &fds, NULL, NULL, pTimeout);
-        } while (retval < 0 && errno == EINTR);
-
-        if (!ma_device_is_started(pDevice)) {
-            return MA_DEVICE_NOT_STARTED;
+        if (deviceType == ma_device_type_capture || deviceType == ma_device_type_duplex) {
+            FD_SET(pDeviceStateOSS->fdCapture, &fdsRead);
+            fdMax = ma_max(fdMax, pDeviceStateOSS->fdCapture);
+        }
+        
+        if (deviceType == ma_device_type_playback || deviceType == ma_device_type_duplex) {
+            FD_SET(pDeviceStateOSS->fdPlayback, &fdsWrite);
+            fdMax = ma_max(fdMax, pDeviceStateOSS->fdPlayback);
         }
 
-        if (FD_ISSET(pDeviceStateOSS->fdCapture, &fds)) {
+        selectResult = select(fdMax + 1, &fdsRead, &fdsWrite, NULL, pTimeout);
+    } while (selectResult < 0 && errno == EINTR);
+
+
+    if (!ma_device_is_started(pDevice)) {
+        return MA_DEVICE_NOT_STARTED;
+    }
+
+
+    if (deviceType == ma_device_type_capture || deviceType == ma_device_type_duplex) {
+        if (FD_ISSET(pDeviceStateOSS->fdCapture, &fdsRead)) {
             ma_uint32 framesRead;
 
             result = ma_device_read__oss(pDevice, pDeviceStateOSS->pIntermediaryBufferCapture, pDevice->capture.internalPeriodSizeInFrames, &framesRead);
@@ -39738,21 +39753,7 @@ static ma_result ma_device_step__oss(ma_device* pDevice, ma_blocking_mode blocki
     }
 
     if (deviceType == ma_device_type_playback || deviceType == ma_device_type_duplex) {
-        int retval;
-
-        do
-        {
-            FD_ZERO(&fds);
-            FD_SET(pDeviceStateOSS->fdPlayback, &fds);
-
-            retval = select(pDeviceStateOSS->fdPlayback + 1, NULL, &fds, NULL, pTimeout);
-        } while (retval < 0 && errno == EINTR);
-
-        if (!ma_device_is_started(pDevice)) {
-            return MA_DEVICE_NOT_STARTED;
-        }
-
-        if (FD_ISSET(pDeviceStateOSS->fdPlayback, &fds)) {
+        if (FD_ISSET(pDeviceStateOSS->fdPlayback, &fdsWrite)) {
             ma_uint32 framesWritten;
 
             result = ma_device_write__oss(pDevice, pDeviceStateOSS->pIntermediaryBufferPlayback, pDevice->playback.internalPeriodSizeInFrames, &framesWritten);