From fbdcb5086af6cff59bcb011f0566560691cf2c2e Mon Sep 17 00:00:00 2001 From: jhb Date: Mon, 8 Oct 2001 23:35:40 +0000 Subject: [PATCH] Don't attempt to initialize the pcaudio device on open. The attach routine already does the initialization (though it didn't set pca_initialized, so we always initialized twice) and since attach calls make_dev(), there's no way that pcaopen() can be called before pcaattach(). --- sys/i386/isa/pcaudio.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index 8002fccfe57d..fa3167164b08 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -144,7 +144,6 @@ static unsigned char alaw_linear[] = { }; static int pca_sleep = 0; -static int pca_initialized = 0; static void pcaintr(struct clockframe *frame); @@ -369,11 +368,6 @@ pcaopen(dev_t dev, int flags, int fmt, struct thread *td) if (minor(dev) > 0) return ENXIO; - if (!pca_initialized) { - pca_init(); - pca_initialized = 1; - } - /* audio device can only be open by one process */ if (pca_status.open) { pca_status.queries = 1;