diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/dev/twe | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/dev/twe')
| -rw-r--r-- | sys/dev/twe/twe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c index 43df8e9..4284942 100644 --- a/sys/dev/twe/twe.c +++ b/sys/dev/twe/twe.c @@ -476,7 +476,7 @@ twe_ioctl(struct twe_softc *sc, int cmd, void *addr) /* if there's a data buffer, allocate and copy it in */ tr->tr_length = tu->tu_size; if (tr->tr_length > 0) { - if ((tr->tr_data = malloc(tr->tr_length, M_DEVBUF, M_WAITOK)) == NULL) { + if ((tr->tr_data = malloc(tr->tr_length, M_DEVBUF, 0)) == NULL) { error = ENOMEM; goto cmd_done; } @@ -559,7 +559,7 @@ twe_ioctl(struct twe_softc *sc, int cmd, void *addr) break; case TWEIO_SET_PARAM: - if ((data = malloc(tp->tp_size, M_DEVBUF, M_WAITOK)) == NULL) { + if ((data = malloc(tp->tp_size, M_DEVBUF, 0)) == NULL) { error = ENOMEM; } else { error = copyin(tp->tp_data, data, tp->tp_size); |
