diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
| commit | 5205a16d8870cdd4cc524589de3e09ad176d129a (patch) | |
| tree | 6deddf1269b9e6f13f2fa00529cd4674c3b2a3fa /drivers/sound | |
| parent | e8b2e78e4f14d329f2cdfb8ef7ed3582c71454e5 (diff) | |
Merge with Linux 2.4.0-ac22-riel.
Diffstat (limited to 'drivers/sound')
| -rw-r--r-- | drivers/sound/es1370.c | 2 | ||||
| -rw-r--r-- | drivers/sound/es1371.c | 2 | ||||
| -rw-r--r-- | drivers/sound/i810_audio.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sound/es1370.c b/drivers/sound/es1370.c index 171106bb8..47d1d875f 100644 --- a/drivers/sound/es1370.c +++ b/drivers/sound/es1370.c @@ -1973,7 +1973,7 @@ static int es1370_ioctl_dac(struct inode *inode, struct file *file, unsigned int return 0; case SNDCTL_DSP_GETOSPACE: - if (!(s->ctrl & CTRL_DAC2_EN) && (val = prog_dmabuf_dac1(s)) != 0) + if (!(s->ctrl & CTRL_DAC1_EN) && (val = prog_dmabuf_dac1(s)) != 0) return val; spin_lock_irqsave(&s->lock, flags); es1370_update_ptr(s); diff --git a/drivers/sound/es1371.c b/drivers/sound/es1371.c index a4d3c8fa1..109ac71c0 100644 --- a/drivers/sound/es1371.c +++ b/drivers/sound/es1371.c @@ -2149,7 +2149,7 @@ static int es1371_ioctl_dac(struct inode *inode, struct file *file, unsigned int return 0; case SNDCTL_DSP_GETOSPACE: - if (!(s->ctrl & CTRL_DAC2_EN) && (val = prog_dmabuf_dac1(s)) != 0) + if (!(s->ctrl & CTRL_DAC1_EN) && (val = prog_dmabuf_dac1(s)) != 0) return val; spin_lock_irqsave(&s->lock, flags); es1371_update_ptr(s); diff --git a/drivers/sound/i810_audio.c b/drivers/sound/i810_audio.c index bd40922c0..1ac21c429 100644 --- a/drivers/sound/i810_audio.c +++ b/drivers/sound/i810_audio.c @@ -1893,7 +1893,7 @@ static int __init i810_init_module (void) if (!pci_present()) /* No PCI bus in this machine! */ return -ENODEV; - if(ftsodell=1) + if(ftsodell==1) clocking=41194; printk(KERN_INFO "Intel 810 + AC97 Audio, version " |