summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2001-10-08 23:35:40 +0000
committerjhb <jhb@FreeBSD.org>2001-10-08 23:35:40 +0000
commitfbdcb5086af6cff59bcb011f0566560691cf2c2e (patch)
tree3e057463ad9a9986502bb07b799d09cf6f2f525e
parent16c9c17233ba578113fb89dd59c9f2cd80631c20 (diff)
downloadFreeBSD-src-fbdcb5086af6cff59bcb011f0566560691cf2c2e.zip
FreeBSD-src-fbdcb5086af6cff59bcb011f0566560691cf2c2e.tar.gz
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().
-rw-r--r--sys/i386/isa/pcaudio.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 8002fcc..fa31671 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;
OpenPOWER on IntegriCloud