1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 9242d7cff9b5..925b056dc2b3 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2307,8 +2307,12 @@ retry:
 
         rc = 0;
         list_for_each_entry_safe(cqr, n, ccw_queue, blocklist) {
-                if (__dasd_sleep_on_erp(cqr))
+                if (__dasd_sleep_on_erp(cqr)) {
+                        if (!cqr->status == DASD_CQR_TERMINATED &&
+                            !cqr->status == DASD_CQR_NEED_ERP)
+                                break;
                         rc = 1;
+                }
         }
         if (rc)
                 goto retry;