summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-04 17:29:19 (GMT)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-04 17:29:19 (GMT)
commit9cdcaa2c9330432bfe891d40f2d914b80bbcf9f3 (patch)
tree68fa88b9f43c0d37d37e7f38f28a3e13dae61031
parent16abfa086096895d438b19198e408ee96da7b508 (diff)
parentd5e89385e92a77b2764d9eb8284808a7628cb2a8 (diff)
downloadlinux-fsl-qoriq-9cdcaa2c9330432bfe891d40f2d914b80bbcf9f3.tar.xz
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] megaraid_old: fix READ_CAPACITY
-rw-r--r--drivers/scsi/megaraid.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 3907f67..da56163 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1753,6 +1753,14 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)
*len = 0;
+ if (scsi_sg_count(cmd) == 1 && !adapter->has_64bit_addr) {
+ sg = scsi_sglist(cmd);
+ scb->dma_h_bulkdata = sg_dma_address(sg);
+ *buf = (u32)scb->dma_h_bulkdata;
+ *len = sg_dma_len(sg);
+ return 0;
+ }
+
scsi_for_each_sg(cmd, sg, sgcnt, idx) {
if (adapter->has_64bit_addr) {
scb->sgl64[idx].address = sg_dma_address(sg);