diff options
| author | arr <arr@FreeBSD.org> | 2001-12-07 17:59:15 +0000 |
|---|---|---|
| committer | arr <arr@FreeBSD.org> | 2001-12-07 17:59:15 +0000 |
| commit | 34eecfd7818703553cd0ec58a65a39ed25701d5e (patch) | |
| tree | 518cebdaade09d76e86540b6b71e5eef2f63f006 /sys/dev/digi | |
| parent | 3e66048c3265f5b7544b9473d71040b08f858593 (diff) | |
| download | FreeBSD-src-34eecfd7818703553cd0ec58a65a39ed25701d5e.zip FreeBSD-src-34eecfd7818703553cd0ec58a65a39ed25701d5e.tar.gz | |
- Fix a bunch of malloc calls where the M_FLAG is incorrectly used; it
should be M_WAITOK.
Spotted by: des
Diffstat (limited to 'sys/dev/digi')
| -rw-r--r-- | sys/dev/digi/digi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c index d6bd40a..f92b534 100644 --- a/sys/dev/digi/digi.c +++ b/sys/dev/digi/digi.c @@ -535,12 +535,12 @@ digi_init(struct digi_softc *sc) if (sc->ports) free(sc->ports, M_TTYS); sc->ports = malloc(sizeof(struct digi_p) * sc->numports, - M_TTYS, M_WAIT | M_ZERO); + M_TTYS, M_WAITOK | M_ZERO); if (sc->ttys) free(sc->ttys, M_TTYS); sc->ttys = malloc(sizeof(struct tty) * sc->numports, - M_TTYS, M_WAIT | M_ZERO); + M_TTYS, M_WAITOK | M_ZERO); /* * XXX Should read port 0xc90 for an array of 2byte values, 1 per @@ -1048,19 +1048,19 @@ digi_loadmoduledata(struct digi_softc *sc) sc->bios.size = digi_mod->dm_bios.size; if (sc->bios.size != 0 && digi_mod->dm_bios.data != NULL) { - sc->bios.data = malloc(sc->bios.size, M_TTYS, M_WAIT); + sc->bios.data = malloc(sc->bios.size, M_TTYS, M_WAITOK); bcopy(digi_mod->dm_bios.data, sc->bios.data, sc->bios.size); } sc->fep.size = digi_mod->dm_fep.size; if (sc->fep.size != 0 && digi_mod->dm_fep.data != NULL) { - sc->fep.data = malloc(sc->fep.size, M_TTYS, M_WAIT); + sc->fep.data = malloc(sc->fep.size, M_TTYS, M_WAITOK); bcopy(digi_mod->dm_fep.data, sc->fep.data, sc->fep.size); } sc->link.size = digi_mod->dm_link.size; if (sc->link.size != 0 && digi_mod->dm_link.data != NULL) { - sc->link.data = malloc(sc->link.size, M_TTYS, M_WAIT); + sc->link.data = malloc(sc->link.size, M_TTYS, M_WAITOK); bcopy(digi_mod->dm_link.data, sc->link.data, sc->link.size); } |
