Merge branch 'topic/emu10k1' into for-linus

diff --combined sound/pci/emu10k1/emu10k1_main.c
index 101a1c13a20dd0b4cdd106d89dd5867187b2b2f9,e6836fc33880b08b33586ef6e065c12e9f8b3750..f18bd6207c5066e0a38b2386feacd06a74039b57
--- 1/sound/pci/emu10k1/emu10k1_main.c
--- 2/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@@ -711,8 -711,7 +711,7 @@@ static int snd_emu1010_load_firmware(st
  static int emu1010_firmware_thread(void *data)
  {
        struct snd_emu10k1 *emu = data;
-       int tmp, tmp2;
-       int reg;
+       u32 tmp, tmp2, reg;
        int err;
  
        for (;;) {
@@@ -758,7 -757,8 +757,8 @@@
                        snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
                        snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
                        snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
-                       snd_printk("Audio Dock ver:%d.%d\n", tmp, tmp2);
+                       snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",
+                                  tmp, tmp2);
                        /* Sync clocking between 1010 and Dock */
                        /* Allow DLL to settle */
                        msleep(10);
@@@ -804,8 -804,7 +804,7 @@@
  static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
  {
        unsigned int i;
-       int tmp, tmp2;
-       int reg;
+       u32 tmp, tmp2, reg;
        int err;
        const char *filename = NULL;
  
@@@ -887,7 -886,7 +886,7 @@@
        snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
        snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
        snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
-       snd_printk("emu1010: Hana version: %d.%d\n", tmp, tmp2);
+       snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);
        /* Enable 48Volt power to Audio Dock */
        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);
  
@@@ -1528,7 -1527,6 +1527,7 @@@ static struct snd_emu_chip_details emu_
         .ca0151_chip = 1,
         .spk71 = 1,
         .spdif_bug = 1,
 +       .invert_shared_spdif = 1,      /* digital/analog switch swapped */
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
         .driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]",