Merge with head.

--HG--
extra : convert_revision : 4fc5f595b23f72c0825d62f21efab46ed1db835b

1 files changed, 2 insertions, 3 deletions

diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index cc3504e83..6e790e438 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -613,12 +613,11 @@ Bus::drain(Event * de)
     //We should check that we're not "doing" anything, and that noone is
     //waiting. We might be idle but have someone waiting if the device we
     //contacted for a retry didn't actually retry.
-    if (curTick >= tickNextIdle && retryList.size() == 0) {
-        return 0;
-    } else {
+    if (retryList.size() || (curTick < tickNextIdle && busIdle.scheduled())) {
         drainEvent = de;
         return 1;
     }
+    return 0;
 }
 
 void