diff options
| author | Doug Hogan <doug@cvs.openbsd.org> | 2014-12-09 07:05:07 +0000 |
|---|---|---|
| committer | Doug Hogan <doug@cvs.openbsd.org> | 2014-12-09 07:05:07 +0000 |
| commit | 8f456837b1fba053042852c2b58706cec1ae226e (patch) | |
| tree | 14aed88be4d213bba6895e0464371d1393be6c24 /sys/dev/usb/uhci.c | |
| parent | ad90d9845d96f21749e3776b0296938c6d60ca9a (diff) | |
More malloc() -> mallocarray() in the kernel.
ok deraadt@ tedu@
Diffstat (limited to 'sys/dev/usb/uhci.c')
| -rw-r--r-- | sys/dev/usb/uhci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 5d5a990d0b4..bcccbd5b444 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.132 2014/10/30 23:50:25 mpi Exp $ */ +/* $OpenBSD: uhci.c,v 1.133 2014/12/09 07:05:06 doug Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -2610,7 +2610,8 @@ uhci_device_setintr(struct uhci_softc *sc, struct uhci_pipe *upipe, int ival) npoll = (UHCI_VFRAMELIST_COUNT + ival - 1) / ival; DPRINTFN(2, ("uhci_device_setintr: ival=%d npoll=%d\n", ival, npoll)); - qhs = malloc(npoll * sizeof(struct uhci_soft_qh *), M_USBHC, M_NOWAIT); + qhs = mallocarray(npoll, sizeof(struct uhci_soft_qh *), M_USBHC, + M_NOWAIT); if (qhs == NULL) return (USBD_NOMEM); |