From fc603e5d0df9b57f26fa9e860edb5f7994453b42 Mon Sep 17 00:00:00 2001
From: Stefan Weinhuber <wein@de.ibm.com>
Date: Tue, 5 Feb 2008 16:50:47 +0100
Subject: [PATCH] --- yaml --- r: 83304 b: refs/heads/master c:
 fe6b8e76d920b93fd445382aff7ff24082af8874 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 274da2e00e90..0c27a856ba62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c5f57c7884a7e0806ae9af86de243321cab4953
+refs/heads/master: fe6b8e76d920b93fd445382aff7ff24082af8874
diff --git a/trunk/drivers/s390/block/dasd.c b/trunk/drivers/s390/block/dasd.c
index ab4f64c49829..d984e0fae630 100644
--- a/trunk/drivers/s390/block/dasd.c
+++ b/trunk/drivers/s390/block/dasd.c
@@ -1706,7 +1706,7 @@ static void __dasd_cleanup_cqr(struct dasd_ccw_req *cqr)
 
 	req = (struct request *) cqr->callback_data;
 	dasd_profile_end(cqr->block, cqr, req);
-	status = cqr->memdev->discipline->free_cp(cqr, req);
+	status = cqr->block->base->discipline->free_cp(cqr, req);
 	if (status <= 0)
 		error = status ? status : -EIO;
 	dasd_end_request(req, error);