Index: /trunk/libffado/src/rme/rme_avdevice.cpp
===================================================================
--- /trunk/libffado/src/rme/rme_avdevice.cpp (revision 2169)
+++ /trunk/libffado/src/rme/rme_avdevice.cpp (revision 2245)
@@ -661,4 +661,5 @@
             // Device not ready; wait 5 ms and try again
             usleep(5000);
+            i++;
         } else {
             iso_rx = stat[2] & 63;
@@ -677,6 +678,9 @@
         }
     }
-    if (i==100 || err)
-        return false;
+    if (i==100 || err) {
+        if (i == 100)
+            debugFatal("timeout waiting for device not busy\n");
+        return false;
+    }
 
     return FFADODevice::resetForStreaming();
@@ -754,5 +758,6 @@
     // functionality in resetForStreaming() means it's effectively done
     // twice when FFADO is first started, but this does no harm.
-    resetForStreaming();
+    if (resetForStreaming() == false)
+        return false;
   
     if (err) {