diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/sound/cmpci.c | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/sound/cmpci.c')
| -rw-r--r-- | drivers/sound/cmpci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/sound/cmpci.c b/drivers/sound/cmpci.c index c7bbffca6..e01aa2429 100644 --- a/drivers/sound/cmpci.c +++ b/drivers/sound/cmpci.c @@ -2315,7 +2315,7 @@ static int four_ch = 0; #ifdef CONFIG_SOUND_CMPCI_REAR static int rear_out = 1; #else -static int read_out = 0; +static int rear_out = 0; #endif int __init init_cmpci(void) @@ -2377,6 +2377,7 @@ int __init init_cmpci(void) s->iobase = pcidev->resource[0].start; s->iosynth = 0x388; s->iomidi = 0x330; + spin_lock_init(&s->lock); if (s->iobase == 0) continue; s->irq = pcidev->irq; |