Date: Fri, 1 Feb 2008 22:31:10 +0100 (CET) From: Stefan Richter Subject: 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 --- drivers/ieee1394/sbp2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Index: linux/drivers/ieee1394/sbp2.c =================================================================== --- linux.orig/drivers/ieee1394/sbp2.c +++ linux/drivers/ieee1394/sbp2.c @@ -1465,10 +1465,9 @@ static void sbp2_prep_command_orb_sg(str 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,