aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index d719a5d8f435..9d2ddb209343 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1907,6 +1907,7 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
1907 "does not support reading geometry\n"); 1907 "does not support reading geometry\n");
1908 drv->heads = 255; 1908 drv->heads = 255;
1909 drv->sectors = 32; // Sectors per track 1909 drv->sectors = 32; // Sectors per track
1910 drv->raid_level = RAID_UNKNOWN;
1910 } else { 1911 } else {
1911 drv->heads = inq_buff->data_byte[6]; 1912 drv->heads = inq_buff->data_byte[6];
1912 drv->sectors = inq_buff->data_byte[7]; 1913 drv->sectors = inq_buff->data_byte[7];
@@ -2491,7 +2492,7 @@ static void do_cciss_request(request_queue_t *q)
2491 c->Request.Type.Type = TYPE_CMD; // It is a command. 2492 c->Request.Type.Type = TYPE_CMD; // It is a command.
2492 c->Request.Type.Attribute = ATTR_SIMPLE; 2493 c->Request.Type.Attribute = ATTR_SIMPLE;
2493 c->Request.Type.Direction = 2494 c->Request.Type.Direction =
2494 (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write; 2495 (rq_data_dir(creq) == READ) ? XFER_READ : XFER_WRITE;
2495 c->Request.Timeout = 0; // Don't time out 2496 c->Request.Timeout = 0; // Don't time out
2496 c->Request.CDB[0] = 2497 c->Request.CDB[0] =
2497 (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write; 2498 (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write;