diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-02-01 22:31:10 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-02-02 13:48:16 +0100 |
| commit | 5fcf500058d5f06720302c5ce138c7bca93f7655 (patch) | |
| tree | f2b6a642ade1c241ba32cb30cdedc7e89abaebce | |
| parent | 384170da9384b7bb3650c0c9b9d17ba0f7bde4ff (diff) | |
| download | op-kernel-dev-5fcf500058d5f06720302c5ce138c7bca93f7655.zip op-kernel-dev-5fcf500058d5f06720302c5ce138c7bca93f7655.tar.gz | |
ieee1394: sbp2: fix bogus s/g access change
sg_dma_len(sg) is invalid before the s/g list is DMA-mapped.
This fixes a post 2.6.24 regression which prevents access to SBP-2
devices on several architectures, introduced by "ieee1394: sbp2: s/g
list access cosmetics", commit 825f1df545ab0289185373b0eaf06fb0b3487422.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -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 2b889d9..28e155a 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, |
