1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 37282b90eecc..bec5486e0e6d 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -163,6 +163,8 @@ dasd_fba_check_characteristics(struct dasd_device *device)
                 return rc;
         }
 
+        device->default_expires = DASD_EXPIRES;
+
         readonly = dasd_device_is_ro(device);
         if (readonly)
                 set_bit(DASD_FLAG_DEVICE_RO, &device->flags);
@@ -370,7 +372,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev,
         cqr->startdev = memdev;
         cqr->memdev = memdev;
         cqr->block = block;
-        cqr->expires = 5 * 60 * HZ;     /* 5 minutes */
+        cqr->expires = memdev->default_expires * HZ;    /* default 5 minutes */
         cqr->retries = 32;
         cqr->buildclk = get_clock();
         cqr->status = DASD_CQR_FILLED;