ALSA: hda - Add a warning if pending IRQ is found

[safe/jmp/linux-2.6] / sound / pci / emu10k1 / emuproc.c

diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index c3fb10e..216f974 100644 (file)
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -28,7 +28,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <sound/core.h>
@@ -245,7 +244,7 @@ static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry,
        unsigned long flags;
        u32 rate;
 
-       if (emu->card_capabilities->emu1010) {
+       if (emu->card_capabilities->emu_model) {
                spin_lock_irqsave(&emu->emu_lock, flags);
                snd_emu1010_fpga_read(emu, 0x38, &value);
                spin_unlock_irqrestore(&emu->emu_lock, flags);
@@ -413,7 +412,7 @@ static void snd_emu_proc_emu1010_reg_read(struct snd_info_entry *entry,
                                     struct snd_info_buffer *buffer)
 {
        struct snd_emu10k1 *emu = entry->private_data;
-       int value;
+       u32 value;
        unsigned long flags;
        int i;
        snd_iprintf(buffer, "EMU1010 Registers:\n\n");
@@ -585,7 +584,7 @@ int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu)
 {
        struct snd_info_entry *entry;
 #ifdef CONFIG_SND_DEBUG
-       if (emu->card_capabilities->emu1010) {
+       if (emu->card_capabilities->emu_model) {
                if (! snd_card_proc_new(emu->card, "emu1010_regs", &entry)) 
                        snd_info_set_text_ops(entry, emu, snd_emu_proc_emu1010_reg_read);
        }