summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound/isa/gusc.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sound/isa/gusc.c')
-rw-r--r--sys/dev/sound/isa/gusc.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index 283c432..1e94e83 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -123,30 +123,27 @@ gusc_probe(device_t dev)
switch (logical_id) {
case LOGICALID_PCM:
s = "Gravis UltraSound Plug & Play PCM";
- func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT);
+ func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT | M_ZERO);
if (func == NULL)
return (ENOMEM);
- bzero(func, sizeof(*func));
func->func = SCF_PCM;
child = device_add_child(dev, "pcm", -1);
device_set_ivars(child, func);
break;
case LOGICALID_OPL:
s = "Gravis UltraSound Plug & Play OPL";
- func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT);
+ func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT | M_ZERO);
if (func == NULL)
return (ENOMEM);
- bzero(func, sizeof(*func));
func->func = SCF_SYNTH;
child = device_add_child(dev, "midi", -1);
device_set_ivars(child, func);
break;
case LOGICALID_MIDI:
s = "Gravis UltraSound Plug & Play MIDI";
- func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT);
+ func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT | M_ZERO);
if (func == NULL)
return (ENOMEM);
- bzero(func, sizeof(*func));
func->func = SCF_MIDI;
child = device_add_child(dev, "midi", -1);
device_set_ivars(child, func);
@@ -272,19 +269,17 @@ gusisa_probe(device_t dev)
/* We can support the CS4231 and MIDI devices. */
- func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT);
+ func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT | M_ZERO);
if (func == NULL)
return ENOMEM;
- bzero(func, sizeof *func);
func->func = SCF_MIDI;
child = device_add_child(dev, "midi", -1);
device_set_ivars(child, func);
- func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT);
+ func = malloc(sizeof(struct sndcard_func), M_DEVBUF, M_NOWAIT | M_ZERO);
if (func == NULL)
printf("xxx: gus pcm not attached, out of memory\n");
else {
- bzero(func, sizeof *func);
func->func = SCF_PCM;
child = device_add_child(dev, "pcm", -1);
device_set_ivars(child, func);
OpenPOWER on IntegriCloud