From 17b1774712a3ed31637d750987b36611d6dc83c5 Mon Sep 17 00:00:00 2001
From: Mike Miller <mike.miller@hp.com>
Date: Mon, 18 Dec 2006 11:00:14 +0100
Subject: [PATCH] --- yaml --- r: 44839 b: refs/heads/master c:
 a52de245ef0b6217a56fb2472ff65c3a196cafd5 h: refs/heads/master i:   44837:
 92aba83bb6119df8da726f74a1f0c7ac936f53c9   44835:
 c31e5c09e141af8b4d2ca5d301d7808b94952b1f   44831:
 d9ea2cff10eadb0ae30c721b482bace5dc82781c v: v3

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

diff --git a/[refs] b/[refs]
index 8181bcfbc6f1..38c5f77dacb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89f97ad1894ab518b05b798906085fb3d1b2d00f
+refs/heads/master: a52de245ef0b6217a56fb2472ff65c3a196cafd5
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 67a6d4a9343a..9d2ddb209343 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -2492,7 +2492,7 @@ static void do_cciss_request(request_queue_t *q)
 	c->Request.Type.Type = TYPE_CMD;	// It is a command.
 	c->Request.Type.Attribute = ATTR_SIMPLE;
 	c->Request.Type.Direction =
-	    (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write;
+	    (rq_data_dir(creq) == READ) ? XFER_READ : XFER_WRITE;
 	c->Request.Timeout = 0;	// Don't time out
 	c->Request.CDB[0] =
 	    (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write;