summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound/pci/neomagic.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sound/pci/neomagic.c')
-rw-r--r--sys/dev/sound/pci/neomagic.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 8681cd6..4ba8615 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -568,8 +568,7 @@ nm_pci_probe(device_t dev)
/* Try to catch other non-ac97 cards */
if (i == NUM_BADCARDS) {
- if (!(sc = malloc(sizeof(*sc), M_DEVBUF,
- M_NOWAIT | M_ZERO))) {
+ if (!(sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO))) {
device_printf(dev, "cannot allocate softc\n");
return ENXIO;
}
@@ -627,12 +626,11 @@ nm_pci_attach(device_t dev)
struct ac97_info *codec = 0;
char status[SND_STATUSLEN];
- if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT)) == NULL) {
+ if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) {
device_printf(dev, "cannot allocate softc\n");
return ENXIO;
}
- bzero(sc, sizeof(*sc));
sc->dev = dev;
sc->type = pci_get_devid(dev);
OpenPOWER on IntegriCloud