diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-03 07:51:38 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-03 07:51:38 +1100 |
| commit | 6598b60fd56ba5e915a001cc4e307880a94d19ae (patch) | |
| tree | 3cf5e13b9bfdc6d953cf3f3bf374458a4855550c /drivers | |
| parent | Merge git://git.infradead.org/battery-2.6 (diff) | |
| parent | ieee1394: sbp2: fix bogus s/g access change (diff) | |
| download | linux-dev-6598b60fd56ba5e915a001cc4e307880a94d19ae.tar.xz linux-dev-6598b60fd56ba5e915a001cc4e307880a94d19ae.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: sbp2: fix bogus s/g access change
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 2b889d91e673..28e155a9e2a5 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c @@ -1465,10 +1465,9 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb, orb->misc |= ORB_SET_DIRECTION(orb_direction); /* special case if only one element (and less than 64KB in size) */ - if ((scsi_use_sg == 1) && - (sg_dma_len(sg) <= SBP2_MAX_SG_ELEMENT_LENGTH)) { + if (scsi_use_sg == 1 && sg->length <= SBP2_MAX_SG_ELEMENT_LENGTH) { - cmd->dma_size = sg_dma_len(sg); + cmd->dma_size = sg->length; cmd->dma_type = CMD_DMA_PAGE; cmd->cmd_dma = dma_map_page(hi->host->device.parent, sg_page(sg), sg->offset, |