diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-04 10:29:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-04 10:29:19 -0700 |
| commit | 9cdcaa2c9330432bfe891d40f2d914b80bbcf9f3 (patch) | |
| tree | 68fa88b9f43c0d37d37e7f38f28a3e13dae61031 | |
| parent | Fix sys_remap_file_pages BUG at highmem.c:15! (diff) | |
| parent | [SCSI] megaraid_old: fix READ_CAPACITY (diff) | |
| download | linux-dev-9cdcaa2c9330432bfe891d40f2d914b80bbcf9f3.tar.xz linux-dev-9cdcaa2c9330432bfe891d40f2d914b80bbcf9f3.zip | |
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.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 3907f6718ede..da56163c30a8 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); |