From 95c1fc6540a904227f9c28623362968f0c91b76a Mon Sep 17 00:00:00 2001
From: Stefan Weinhuber <wein@de.ibm.com>
Date: Wed, 5 Mar 2008 12:37:10 +0100
Subject: [PATCH] --- yaml --- r: 86929 b: refs/heads/master c:
 5c12f2406cea24a2c885a8d3e5aa7ab94c65f0d5 h: refs/heads/master i:   86927:
 1d1a62523cefbae5fe8670a68f467b260efcb501 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/s390/block/dasd_3990_erp.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f5b22d8a56f7..05e393f822b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98c7b388afffdc5699095261b437b286d718270c
+refs/heads/master: 5c12f2406cea24a2c885a8d3e5aa7ab94c65f0d5
diff --git a/trunk/drivers/s390/block/dasd_3990_erp.c b/trunk/drivers/s390/block/dasd_3990_erp.c
index f69714a0e9e7..b19db20a0bef 100644
--- a/trunk/drivers/s390/block/dasd_3990_erp.c
+++ b/trunk/drivers/s390/block/dasd_3990_erp.c
@@ -2310,10 +2310,8 @@ static int
 dasd_3990_erp_error_match(struct dasd_ccw_req *cqr1, struct dasd_ccw_req *cqr2)
 {
 
-	/* check failed CCW */
-	if (cqr1->irb.scsw.cpa != cqr2->irb.scsw.cpa) {
-		//	return 0;	/* CCW doesn't match */
-	}
+	if (cqr1->startdev != cqr2->startdev)
+		return 0;
 
 	if (cqr1->irb.esw.esw0.erw.cons != cqr2->irb.esw.esw0.erw.cons)
 		return 0;