mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-09-21 20:21:39 +00:00
[libata] restore sg on DMA mapping failure
This commit is contained in:
parent
fecb4a0c87
commit
537a95d935
1 changed files with 8 additions and 2 deletions
|
@ -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,
|
dma_address = dma_map_single(ap->host_set->dev, qc->buf_virt,
|
||||||
sg->length, dir);
|
sg->length, dir);
|
||||||
if (dma_mapping_error(dma_address))
|
if (dma_mapping_error(dma_address)) {
|
||||||
|
/* restore sg */
|
||||||
|
sg->length += qc->pad_len;
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
sg_dma_address(sg) = dma_address;
|
sg_dma_address(sg) = dma_address;
|
||||||
sg_dma_len(sg) = sg->length;
|
sg_dma_len(sg) = sg->length;
|
||||||
|
@ -2694,8 +2697,11 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
|
||||||
|
|
||||||
dir = qc->dma_dir;
|
dir = qc->dma_dir;
|
||||||
n_elem = dma_map_sg(ap->host_set->dev, sg, qc->n_elem, 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;
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
DPRINTK("%d sg elements mapped\n", n_elem);
|
DPRINTK("%d sg elements mapped\n", n_elem);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue