1 files changed, 6 insertions, 4 deletions

diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index f0eda4bbbb39..5905188d06b5 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -2033,7 +2033,7 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)
                         }
                 }
         }
-        printk("vortex: FATAL: ResManager: resource type %d exhausted.\n", restype);
+        printk(KERN_ERR "vortex: FATAL: ResManager: resource type %d exhausted.\n", restype);
         return -ENOMEM;
 }
 
@@ -2165,7 +2165,7 @@ vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type)
                                 memset(stream->resources, 0,
                                        sizeof(unsigned char) *
                                        VORTEX_RESOURCE_LAST);
-                                printk("vortex: out of A3D sources. Sorry\n");
+                                printk(KERN_ERR "vortex: out of A3D sources. Sorry\n");
                                 return -EBUSY;
                         }
                         /* (De)Initialize A3D hardware source. */
@@ -2532,7 +2532,8 @@ vortex_codec_write(ac97_t * codec, unsigned short addr, unsigned short data)
         hwwrite(card->mmio, VORTEX_CODEC_IO,
                 ((addr << VORTEX_CODEC_ADDSHIFT) & VORTEX_CODEC_ADDMASK) |
                 ((data << VORTEX_CODEC_DATSHIFT) & VORTEX_CODEC_DATMASK) |
-                VORTEX_CODEC_WRITE);
+                VORTEX_CODEC_WRITE |
+                (codec->num << VORTEX_CODEC_ID_SHIFT) );
 
         /* Flush Caches. */
         hwread(card->mmio, VORTEX_CODEC_IO);
@@ -2554,7 +2555,8 @@ static unsigned short vortex_codec_read(ac97_t * codec, unsigned short addr)
                 }
         }
         /* set up read address */
-        read_addr = ((addr << VORTEX_CODEC_ADDSHIFT) & VORTEX_CODEC_ADDMASK);
+        read_addr = ((addr << VORTEX_CODEC_ADDSHIFT) & VORTEX_CODEC_ADDMASK) |
+                (codec->num << VORTEX_CODEC_ID_SHIFT) ;
         hwwrite(card->mmio, VORTEX_CODEC_IO, read_addr);
 
         /* wait for address */