1 files changed, 2 insertions, 12 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 329db997ee66..3679aeca1c1a 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2326,21 +2326,11 @@ retry:
                         return -EAGAIN;
 
                 /* normal recovery for basedev IO */
-                if (__dasd_sleep_on_erp(cqr)) {
+                if (__dasd_sleep_on_erp(cqr))
+                        /* handle erp first */
                         goto retry;
-                        /* remember that ERP was needed */
-                        rc = 1;
-                        /* skip processing for active cqr */
-                        if (cqr->status != DASD_CQR_TERMINATED &&
-                            cqr->status != DASD_CQR_NEED_ERP)
-                                break;
-                }
         }
 
-        /* start ERP requests in upper loop */
-        if (rc)
-                goto retry;
-
         return 0;
 }