diff options
author | David Malone <dwmalone@FreeBSD.org> | 2000-11-18 15:21:22 +0000 |
---|---|---|
committer | David Malone <dwmalone@FreeBSD.org> | 2000-11-18 15:21:22 +0000 |
commit | ca89ee278e1d0cff6ce3d52d53a7b004bf093f40 (patch) | |
tree | 0c3ddb8a43b4e4275b28bb051fdf33aaa6ee5d08 /sys/dev/amr | |
parent | 99cdf4ccb20964be566b457fdf69729b22b1d3d8 (diff) | |
download | src-ca89ee278e1d0cff6ce3d52d53a7b004bf093f40.tar.gz src-ca89ee278e1d0cff6ce3d52d53a7b004bf093f40.zip |
Further use of M_ZERO.
Submitted by: josh@zipperup.org
Submitted by: Robert Drehmel <robd@gmx.net>
Approved by: msmith
Notes
Notes:
svn path=/head/; revision=68877
Diffstat (limited to 'sys/dev/amr')
-rw-r--r-- | sys/dev/amr/amr.c | 3 | ||||
-rw-r--r-- | sys/dev/amr/amr_cam.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c index d870df8511ae..7ffe1b16a954 100644 --- a/sys/dev/amr/amr.c +++ b/sys/dev/amr/amr.c @@ -414,11 +414,10 @@ amr_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p) /* handle SCSI passthrough command */ if (au->au_cmd[0] == AMR_CMD_PASS) { - if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_WAITOK)) == NULL) { + if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_WAITOK | M_ZERO)) == NULL) { error = ENOMEM; break; } - bzero(ap, sizeof(*ap)); /* copy cdb */ ap->ap_cdb_length = au->au_cmd[2]; diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c index 45ecc523c3aa..b8d7be4e650f 100644 --- a/sys/dev/amr/amr_cam.c +++ b/sys/dev/amr/amr_cam.c @@ -319,11 +319,10 @@ amr_cam_command(struct amr_softc *sc, struct amr_command **acp) */ /* construct passthrough */ - if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_NOWAIT)) == NULL) { + if ((ap = malloc(sizeof(*ap), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { error = ENOMEM; goto out; } - bzero(ap, sizeof(*ap)); ap->ap_timeout = 0; ap->ap_ars = 1; ap->ap_request_sense_length = 14; |