aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-10-16 06:29:34 -0400
committerJens Axboe <jens.axboe@oracle.com>2007-10-16 06:29:34 -0400
commit3eed13fd933dbb81db12f7cdec6de9268c4443b5 (patch)
treec16913706acffd4a0b29ec12cd68906b708c9a8a /drivers/block
parenta39d113936370ba524fa9e34d6954c3625c8aa64 (diff)
parent2c941a204070ab32d92d40318a3196a7fb994c00 (diff)
Merge branch 'sglist-arch' into for-linus
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index a895228f3d70..3fb7e8bc436d 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2569,6 +2569,7 @@ static void do_cciss_request(struct request_queue *q)
2569 (int)creq->nr_sectors); 2569 (int)creq->nr_sectors);
2570#endif /* CCISS_DEBUG */ 2570#endif /* CCISS_DEBUG */
2571 2571
2572 memset(tmp_sg, 0, sizeof(tmp_sg));
2572 seg = blk_rq_map_sg(q, creq, tmp_sg); 2573 seg = blk_rq_map_sg(q, creq, tmp_sg);
2573 2574
2574 /* get the DMA records for the setup */ 2575 /* get the DMA records for the setup */