aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/emu10k1_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/emu10k1/emu10k1_main.c')
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 101a1c13a20d..f18bd6207c50 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -711,8 +711,7 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, const char *filena
711static int emu1010_firmware_thread(void *data) 711static int emu1010_firmware_thread(void *data)
712{ 712{
713 struct snd_emu10k1 *emu = data; 713 struct snd_emu10k1 *emu = data;
714 int tmp, tmp2; 714 u32 tmp, tmp2, reg;
715 int reg;
716 int err; 715 int err;
717 716
718 for (;;) { 717 for (;;) {
@@ -758,7 +757,8 @@ static int emu1010_firmware_thread(void *data)
758 snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n"); 757 snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
759 snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp); 758 snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
760 snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2); 759 snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
761 snd_printk("Audio Dock ver:%d.%d\n", tmp, tmp2); 760 snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",
761 tmp, tmp2);
762 /* Sync clocking between 1010 and Dock */ 762 /* Sync clocking between 1010 and Dock */
763 /* Allow DLL to settle */ 763 /* Allow DLL to settle */
764 msleep(10); 764 msleep(10);
@@ -804,8 +804,7 @@ static int emu1010_firmware_thread(void *data)
804static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 804static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
805{ 805{
806 unsigned int i; 806 unsigned int i;
807 int tmp, tmp2; 807 u32 tmp, tmp2, reg;
808 int reg;
809 int err; 808 int err;
810 const char *filename = NULL; 809 const char *filename = NULL;
811 810
@@ -887,7 +886,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
887 snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n"); 886 snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
888 snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp); 887 snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
889 snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2); 888 snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
890 snd_printk("emu1010: Hana version: %d.%d\n", tmp, tmp2); 889 snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);
891 /* Enable 48Volt power to Audio Dock */ 890 /* Enable 48Volt power to Audio Dock */
892 snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON); 891 snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);
893 892