diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | a163d034fadcfb4a25ca34a2ba5f491c47b6ff69 (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/dev/ppbus | |
| parent | 8f3e32c2b6b9f392e096f096653596f55f2134ae (diff) | |
Notes
Diffstat (limited to 'sys/dev/ppbus')
| -rw-r--r-- | sys/dev/ppbus/if_plip.c | 2 | ||||
| -rw-r--r-- | sys/dev/ppbus/lpt.c | 4 | ||||
| -rw-r--r-- | sys/dev/ppbus/vpo.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c index 24a18ecd00210..5ba4dc3a60992 100644 --- a/sys/dev/ppbus/if_plip.c +++ b/sys/dev/ppbus/if_plip.c @@ -343,7 +343,7 @@ lpioctl (struct ifnet *ifp, u_long cmd, caddr_t data) } sc->sc_ifbuf = malloc(sc->sc_if.if_mtu + MLPIPHDRLEN, - M_DEVBUF, 0); + M_DEVBUF, M_WAITOK); if (!sc->sc_ifbuf) { ppb_release_bus(ppbus, dev); return ENOBUFS; diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c index abc9e95c5d76f..9364c50336597 100644 --- a/sys/dev/ppbus/lpt.c +++ b/sys/dev/ppbus/lpt.c @@ -548,8 +548,8 @@ lptopen(dev_t dev, int flags, int fmt, struct thread *td) ppb_wctr(ppbus, sc->sc_control); sc->sc_state = OPEN; - sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, 0); - sc->sc_statbuf = malloc(BUFSTATSIZE, M_DEVBUF, 0); + sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, M_WAITOK); + sc->sc_statbuf = malloc(BUFSTATSIZE, M_DEVBUF, M_WAITOK); sc->sc_xfercnt = 0; splx(s); diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c index 09208b6e9d564..ad83e2f832707 100644 --- a/sys/dev/ppbus/vpo.c +++ b/sys/dev/ppbus/vpo.c @@ -186,7 +186,7 @@ static void vpo_cam_rescan(struct vpo_data *vpo) { struct cam_path *path; - union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_ZERO); + union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO); if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0) != CAM_REQ_CMP) { |