redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[libata] restore sg on DMA mapping failure

wifi-calibration
Tejun Heo 2005-11-05 14:29:01 -05:00 committed by Jeff Garzik
parent fecb4a0c87
commit 537a95d935
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/scsi/libata-core.c
View File

@ -2622,8 +2622,11 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
dma_address = dma_map_single(ap->host_set->dev, qc->buf_virt,
sg->length, dir);
if (dma_mapping_error(dma_address))
if (dma_mapping_error(dma_address)) {
/* restore sg */
sg->length += qc->pad_len;
return -1;
}
sg_dma_address(sg) = dma_address;
sg_dma_len(sg) = sg->length;
@ -2694,8 +2697,11 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
dir = qc->dma_dir;
n_elem = dma_map_sg(ap->host_set->dev, sg, qc->n_elem, dir);
if (n_elem < 1)
if (n_elem < 1) {
/* restore last sg */
lsg->length += qc->pad_len;
return -1;
}
DPRINTK("%d sg elements mapped\n", n_elem);