--- csapcm.c.0 Mon Sep 30 13:40:03 2002 +++ csapcm.c Mon Sep 30 13:35:31 2002 @@ -858,22 +858,27 @@ pcmcsa_resume(device_t dev) { struct csa_info *sc; - int mr; + int e; device_printf(dev, "resuming\n"); sc = pcm_getdevinfo(dev); + if ((e = csa_init(sc)) != 0) { + device_printf(dev, "csa_init failed %d\n", e); + return e; + } + /* csachan_trigger pushes sample rate and format. Makes life easier */ if (sc->pch.was_running) csachan_trigger(0, &sc->pch, PCMTRIG_START); if (sc->rch.was_running) - csachan_trigger(0, &sc->rch, PCMTRIG_START); + csachan_trigger(0, &sc->rch, PCMTRIG_START); - if ((mr = mixer_reinit(dev)) != 0) { - device_printf(dev, "mixer_reinit failed: %d\n", mr); - return mr; + if ((e = mixer_reinit(dev)) != 0) { + device_printf(dev, "mixer_reinit failed: %d\n", e); + return e; } return 0;