diff options
| author | Gerhard Roth <gerhard@cvs.openbsd.org> | 2018-12-05 17:41:24 +0000 |
|---|---|---|
| committer | Gerhard Roth <gerhard@cvs.openbsd.org> | 2018-12-05 17:41:24 +0000 |
| commit | 90a109b457252b795ff4238d2e09c31009a3b6cc (patch) | |
| tree | 43bd156288e80d393aaa7a28b16b9dad20514cab /sys | |
| parent | 1d1e8f4a9a29bddb31d481770e7be1ed25d6adae (diff) | |
usb_block_allocmem() won't sleep.
ok mpi@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/usb_mem.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c index bca2a175c9f..c65906b43f4 100644 --- a/sys/dev/usb/usb_mem.c +++ b/sys/dev/usb/usb_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_mem.c,v 1.31 2018/11/18 16:33:26 mpi Exp $ */ +/* $OpenBSD: usb_mem.c,v 1.32 2018/12/05 17:41:23 gerhard Exp $ */ /* $NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $ */ /* @@ -108,8 +108,6 @@ usb_block_allocmem(bus_dma_tag_t tag, size_t size, size_t align, } splx(s); - assertwaitok(); - DPRINTFN(6, ("usb_block_allocmem: no free\n")); p = malloc(sizeof *p, M_USB, M_NOWAIT); if (p == NULL) @@ -157,7 +155,6 @@ free0: void usb_block_real_freemem(struct usb_dma_block *p) { - assertwaitok(); bus_dmamap_unload(p->tag, p->map); bus_dmamap_destroy(p->tag, p->map); bus_dmamem_unmap(p->tag, p->kaddr, p->size); |