From 7912208b8d0075a9318a0d28916a3b229bed37af Mon Sep 17 00:00:00 2001 From: Stefan Weinhuber Date: Mon, 25 Oct 2010 16:10:08 +0200 Subject: [PATCH] --- yaml --- r: 216739 b: refs/heads/master c: 7ea8d32199a3751527bf06b91c03de92d5ad5b3e h: refs/heads/master i: 216737: fe92850f5843cfe43b9767e36ebf72619ac7846f 216735: b53b8317b46c61ed3fe94276562aba69f5f415fe v: v3 --- [refs] | 2 +- trunk/drivers/s390/block/dasd_3990_erp.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 471ef6d507c2..bdbce183d702 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 238ec4efeee4461d5cff2ed3e5a15a3ab850959b +refs/heads/master: 7ea8d32199a3751527bf06b91c03de92d5ad5b3e diff --git a/trunk/drivers/s390/block/dasd_3990_erp.c b/trunk/drivers/s390/block/dasd_3990_erp.c index e82d427ff5eb..968c76cf7127 100644 --- a/trunk/drivers/s390/block/dasd_3990_erp.c +++ b/trunk/drivers/s390/block/dasd_3990_erp.c @@ -221,6 +221,7 @@ dasd_3990_erp_DCTL(struct dasd_ccw_req * erp, char modifier) ccw->cmd_code = CCW_CMD_DCTL; ccw->count = 4; ccw->cda = (__u32)(addr_t) DCTL_data; + dctl_cqr->flags = erp->flags; dctl_cqr->function = dasd_3990_erp_DCTL; dctl_cqr->refers = erp; dctl_cqr->startdev = device; @@ -1710,6 +1711,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense) ccw->cda = cpa; /* fill erp related fields */ + erp->flags = default_erp->flags; erp->function = dasd_3990_erp_action_1B_32; erp->refers = default_erp->refers; erp->startdev = device; @@ -2354,6 +2356,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) ccw->cda = (long)(cqr->cpaddr); } + erp->flags = cqr->flags; erp->function = dasd_3990_erp_add_erp; erp->refers = cqr; erp->startdev = device;