From 004145128094b3740eacccf349f12a60c3307d8c Mon Sep 17 00:00:00 2001 From: Stefan Weinhuber Date: Tue, 27 Dec 2011 11:27:23 +0100 Subject: [PATCH] --- yaml --- r: 280631 b: refs/heads/master c: 1afcfd5948ff27cdbc6d91e9f3cdbdd7f3b1e566 h: refs/heads/master i: 280629: 27fa39d8d56db7d77b425e0d7875b6080a4c339a 280627: 410caf5664fe0e7ed1593d17d0ba840c6fd49244 280623: 9a572402ff0f07cab02ee356e8aaa19838401286 v: v3 --- [refs] | 2 +- trunk/drivers/s390/block/dasd_3990_erp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d6acc770f115..9abf7f9d6f42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85ac7ca5972d63d23aa5ea75c3834a33b951f89d +refs/heads/master: 1afcfd5948ff27cdbc6d91e9f3cdbdd7f3b1e566 diff --git a/trunk/drivers/s390/block/dasd_3990_erp.c b/trunk/drivers/s390/block/dasd_3990_erp.c index 87a0cf160fe5..0326571e7ffa 100644 --- a/trunk/drivers/s390/block/dasd_3990_erp.c +++ b/trunk/drivers/s390/block/dasd_3990_erp.c @@ -1718,7 +1718,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense) erp->startdev = device; erp->memdev = device; erp->magic = default_erp->magic; - erp->expires = 0; + erp->expires = default_erp->expires; erp->retries = 256; erp->buildclk = get_clock(); erp->status = DASD_CQR_FILLED; @@ -2363,7 +2363,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) erp->memdev = device; erp->block = cqr->block; erp->magic = cqr->magic; - erp->expires = 0; + erp->expires = cqr->expires; erp->retries = 256; erp->buildclk = get_clock(); erp->status = DASD_CQR_FILLED;