Merge branch 'topic/misc' into for-linus

3 files changed, 51 insertions, 16 deletions

diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c
index 649849e540d3..f4aa8ff6f5f9 100644
--- a/sound/pci/au88x0/au88x0_a3d.c
+++ b/sound/pci/au88x0/au88x0_a3d.c
@@ -462,9 +462,10 @@ static void a3dsrc_ZeroSliceIO(a3dsrc_t * a)
 /* Reset Single A3D source. */
 static void a3dsrc_ZeroState(a3dsrc_t * a)
 {
-
-        //printk("vortex: ZeroState slice: %d, source %d\n", a->slice, a->source);
-
+        /*
+        printk(KERN_DEBUG "vortex: ZeroState slice: %d, source %d\n",
+               a->slice, a->source);
+        */
         a3dsrc_SetAtmosState(a, 0, 0, 0, 0);
         a3dsrc_SetHrtfState(a, A3dHrirZeros, A3dHrirZeros);
         a3dsrc_SetItdDline(a, A3dItdDlineZeros);
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index b070e5714514..3906f5afe27a 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -1135,7 +1135,10 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
                         snd_pcm_sgbuf_get_addr(dma->substream, 0));
                 break;
         }
-        //printk("vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n", dma->cfg0, dma->cfg1);
+        /*
+        printk(KERN_DEBUG "vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n",
+               dma->cfg0, dma->cfg1);
+        */
         hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG0 + (adbdma << 3), dma->cfg0);
         hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFCFG1 + (adbdma << 3), dma->cfg1);
 
@@ -1959,7 +1962,7 @@ vortex_connect_codecplay(vortex_t * vortex, int en, unsigned char mixers[])
                                           ADB_CODECOUT(0 + 4));
                 vortex_connection_mix_adb(vortex, en, 0x11, mixers[3],
                                           ADB_CODECOUT(1 + 4));
-                //printk("SDAC detected ");
+                /* printk(KERN_DEBUG "SDAC detected "); */
         }
 #else
         // Use plain direct output to codec.
@@ -2013,7 +2016,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)
                                         resmap[restype] |= (1 << i);
                                 else
                                         vortex->dma_adb[i].resources[restype] |= (1 << i);
-                                //printk("vortex: ResManager: type %d out %d\n", restype, i);
+                                /*
+                                printk(KERN_DEBUG
+                                       "vortex: ResManager: type %d out %d\n",
+                                       restype, i);
+                                */
                                 return i;
                         }
                 }
@@ -2024,7 +2031,11 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)
                 for (i = 0; i < qty; i++) {
                         if (resmap[restype] & (1 << i)) {
                                 resmap[restype] &= ~(1 << i);
-                                //printk("vortex: ResManager: type %d in %d\n",restype, i);
+                                /*
+                                printk(KERN_DEBUG
+                                       "vortex: ResManager: type %d in %d\n",
+                                       restype, i);
+                                */
                                 return i;
                         }
                 }
@@ -2789,7 +2800,7 @@ vortex_translateformat(vortex_t * vortex, char bits, char nch, int encod)
 {
         int a, this_194;
 
-        if ((bits != 8) || (bits != 16))
+        if ((bits != 8) && (bits != 16))
                 return -1;
 
         switch (encod) {
diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c
index 978b856f5621..2805e34bd41d 100644
--- a/sound/pci/au88x0/au88x0_synth.c
+++ b/sound/pci/au88x0/au88x0_synth.c
@@ -213,38 +213,59 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
         switch (reg) {
                 /* Voice specific parameters */
         case 0:         /* running */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_RUN(wt), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_RUN(wt), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_RUN(wt), val);
                 return 0xc;
                 break;
         case 1:         /* param 0 */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,0), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_PARM(wt,0), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_PARM(wt, 0), val);
                 return 0xc;
                 break;
         case 2:         /* param 1 */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,1), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_PARM(wt,1), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_PARM(wt, 1), val);
                 return 0xc;
                 break;
         case 3:         /* param 2 */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,2), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_PARM(wt,2), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_PARM(wt, 2), val);
                 return 0xc;
                 break;
         case 4:         /* param 3 */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_PARM(wt,3), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_PARM(wt,3), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_PARM(wt, 3), val);
                 return 0xc;
                 break;
         case 6:         /* mute */
-                //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_MUTE(wt), (int)val);
+                /*
+                printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                       WT_MUTE(wt), (int)val);
+                */
                 hwwrite(vortex->mmio, WT_MUTE(wt), val);
                 return 0xc;
                 break;
         case 0xb:
                 {               /* delay */
-                        //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", WT_DELAY(wt,0), (int)val);
+                        /*
+                        printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",
+                               WT_DELAY(wt,0), (int)val);
+                        */
                         hwwrite(vortex->mmio, WT_DELAY(wt, 3), val);
                         hwwrite(vortex->mmio, WT_DELAY(wt, 2), val);
                         hwwrite(vortex->mmio, WT_DELAY(wt, 1), val);
@@ -272,7 +293,9 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
                 return 0;
                 break;
         }
-        //printk("vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val);
+        /*
+        printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val);
+        */
         hwwrite(vortex->mmio, ecx, val);
         return 1;
 }