Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in error path. From OpenBSD.

Browse Source
This commit is contained in:
augustss 2004-01-05 13:30:45 +00:00
parent 5f31dab3df
commit 4d6e985752
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/usb/usb_mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $ */
/* $NetBSD: usb_mem.c,v 1.27 2004/01/05 13:30:45 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.27 2004/01/05 13:30:45 augustss Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -143,7 +143,6 @@ usb_block_allocmem(bus_dma_tag_t tag, size_t size, size_t align,
p = malloc(sizeof *p, M_USB, M_NOWAIT);
if (p == NULL)
return (USBD_NOMEM);
*dmap = p;
p->tag = tag;
p->size = size;
@ -152,12 +151,12 @@ usb_block_allocmem(bus_dma_tag_t tag, size_t size, size_t align,
p->segs, sizeof(p->segs)/sizeof(p->segs[0]),
&p->nsegs, BUS_DMA_NOWAIT);
if (error)
return (USBD_NOMEM);
goto free0;
error = bus_dmamem_map(tag, p->segs, p->nsegs, p->size,
&p->kaddr, BUS_DMA_NOWAIT|BUS_DMA_COHERENT);
if (error)
goto free;
goto free1;
error = bus_dmamap_create(tag, p->size, 1, p->size,
0, BUS_DMA_NOWAIT, &p->map);
@ -168,14 +167,18 @@ usb_block_allocmem(bus_dma_tag_t tag, size_t size, size_t align,
BUS_DMA_NOWAIT);
if (error)
goto destroy;
*dmap = p;
return (USBD_NORMAL_COMPLETION);
destroy:
destroy:
bus_dmamap_destroy(tag, p->map);
unmap:
unmap:
bus_dmamem_unmap(tag, p->kaddr, p->size);
free:
free1:
bus_dmamem_free(tag, p->segs, p->nsegs);
free0:
free(p, M_USB);
return (USBD_NOMEM);
}