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/amr | |
| 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/amr')
| -rw-r--r-- | sys/dev/amr/amr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c index e75c2af..e763c6c 100644 --- a/sys/dev/amr/amr.c +++ b/sys/dev/amr/amr.c @@ -433,7 +433,7 @@ amr_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *td) debug(1, "AMR_IO_COMMAND 0x%x", au->au_cmd[0]); /* handle inbound data buffer */ if (au->au_length != 0) { - if ((dp = malloc(au->au_length, M_DEVBUF, M_WAITOK)) == NULL) { + if ((dp = malloc(au->au_length, M_DEVBUF, 0)) == NULL) { error = ENOMEM; break; } @@ -449,7 +449,7 @@ amr_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *td) /* handle SCSI passthrough command */ if (au->au_cmd[0] == AMR_CMD_PASS) { - if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) { + if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_ZERO)) == NULL) { error = ENOMEM; break; } |
