UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 825f1df545.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2008-02-01 22:31:10 +01:00
parent 384170da93
commit 5fcf500058
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/ieee1394/sbp2.c
View File

@ -1465,10 +1465,9 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb,
orb->misc |= ORB_SET_DIRECTION(orb_direction); orb->misc |= ORB_SET_DIRECTION(orb_direction);
/* special case if only one element (and less than 64KB in size) */ /* special case if only one element (and less than 64KB in size) */
if ((scsi_use_sg == 1) && if (scsi_use_sg == 1 && sg->length <= SBP2_MAX_SG_ELEMENT_LENGTH) {
(sg_dma_len(sg) <= SBP2_MAX_SG_ELEMENT_LENGTH)) {
cmd->dma_size = sg_dma_len(sg); cmd->dma_size = sg->length;
cmd->dma_type = CMD_DMA_PAGE; cmd->dma_type = CMD_DMA_PAGE;
cmd->cmd_dma = dma_map_page(hi->host->device.parent, cmd->cmd_dma = dma_map_page(hi->host->device.parent,
sg_page(sg), sg->offset, sg_page(sg), sg->offset,