aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/emuproc.c
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2007-11-04 09:08:26 -0500
committerMercurial server <hg@alsa0.alsa-project.org>2008-01-31 11:30:24 -0500
commit190d2c46e52592ba092e8bf8acd4427c920f2d69 (patch)
treebc4f4271f08aa57ac520fa2536c3990f8741fd55 /sound/pci/emu10k1/emuproc.c
parent44893a36ba49349e0f9d4bc3b7bbf9b54469ae1a (diff)
[ALSA] snd:emu10k1: E-Mu updates. Fixes to firmware loading and support for 0404.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/emu10k1/emuproc.c')
-rw-r--r--sound/pci/emu10k1/emuproc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index bd8a47116528..f3caa3f890c6 100644
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -244,7 +244,7 @@ static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry,
244 unsigned long flags; 244 unsigned long flags;
245 u32 rate; 245 u32 rate;
246 246
247 if (emu->card_capabilities->emu1010) { 247 if (emu->card_capabilities->emu_model) {
248 spin_lock_irqsave(&emu->emu_lock, flags); 248 spin_lock_irqsave(&emu->emu_lock, flags);
249 snd_emu1010_fpga_read(emu, 0x38, &value); 249 snd_emu1010_fpga_read(emu, 0x38, &value);
250 spin_unlock_irqrestore(&emu->emu_lock, flags); 250 spin_unlock_irqrestore(&emu->emu_lock, flags);
@@ -584,7 +584,7 @@ int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu)
584{ 584{
585 struct snd_info_entry *entry; 585 struct snd_info_entry *entry;
586#ifdef CONFIG_SND_DEBUG 586#ifdef CONFIG_SND_DEBUG
587 if (emu->card_capabilities->emu1010) { 587 if (emu->card_capabilities->emu_model) {
588 if (! snd_card_proc_new(emu->card, "emu1010_regs", &entry)) 588 if (! snd_card_proc_new(emu->card, "emu1010_regs", &entry))
589 snd_info_set_text_ops(entry, emu, snd_emu_proc_emu1010_reg_read); 589 snd_info_set_text_ops(entry, emu, snd_emu_proc_emu1010_reg_read);
590 } 590 }