d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix badly placed '{'

Browse Source 
Dont leak requests on busdma failure (not that we'd get anywhere anyhow).

Reported by: antoine@
This commit is contained in:
Søren Schmidt 2008-04-11 22:56:27 +00:00
parent 20a8e8d594
commit 31d745f2ed
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/ata/ata-all.c
View File

@ -1014,12 +1014,14 @@ ata_alloc_request(device_t dev)
NULL, NULL, PAGE_SIZE, 1, PAGE_SIZE,
0, NULL, NULL, &request->dma.sg_tag)) {
device_printf(ch->dev, "FAILURE - create sg_tag\n");
uma_zfree(ata_request_zone, request);
return NULL;
}
if (bus_dmamem_alloc(request->dma.sg_tag, (void **)&request->dma.sg, 0,
&request->dma.sg_map)) {
device_printf(ch->dev, "FAILURE - alloc sg_map\n");
bus_dma_tag_destroy(request->dma.sg_tag);
uma_zfree(ata_request_zone, request);
return NULL;
}
if (bus_dma_tag_create(ch->dma.dmatag,
@ -1033,6 +1035,7 @@ ata_alloc_request(device_t dev)
bus_dmamem_free(request->dma.sg_tag, request->dma.sg,
request->dma.sg_map);
bus_dma_tag_destroy(request->dma.sg_tag);
uma_zfree(ata_request_zone, request);
return NULL;
}
request->dev = dev;
@ -1045,10 +1048,10 @@ ata_alloc_request(device_t dev)
void
ata_free_request(struct ata_request *request)
{
if (!(request->flags & ATA_R_DANGER2))
if (!(request->flags & ATA_R_DANGER2)) {
if (request->dma.data_tag)
bus_dma_tag_destroy(request->dma.data_tag);
if (request->dma.sg_tag) {
if (request->dma.sg_tag)
bus_dma_tag_destroy(request->dma.sg_tag);
uma_zfree(ata_request_zone, request);
}