Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

8 files changed, 56 insertions, 28 deletions

diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index b0e00f0a7c2f..dd1ea9d3b81a 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -188,7 +188,7 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
         if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,
                                sizeof(snd_emu10k1_synth_arg_t), &wave) < 0 ||
             wave == NULL) {
-                snd_printk("can't initialize Emu10k1 wavetable synth\n");
+                snd_printk(KERN_WARNING "can't initialize Emu10k1 wavetable synth\n");
         } else {
                 snd_emu10k1_synth_arg_t *arg;
                 arg = SNDRV_SEQ_DEVICE_ARGPTR(wave);
diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c
index 7cf2f908eed9..6589bf24abcd 100644
--- a/sound/pci/emu10k1/emu10k1_callback.c
+++ b/sound/pci/emu10k1/emu10k1_callback.c
@@ -241,7 +241,7 @@ lookup_voices(snd_emux_t *emu, emu10k1_t *hw, best_voice_t *best, int active_onl
                 else if (state == SNDRV_EMUX_ST_RELEASED ||
                          state == SNDRV_EMUX_ST_PENDING) {
                         bp = best + V_RELEASED;
-#if 0
+#if 1
                         val = snd_emu10k1_ptr_read(hw, CVCF_CURRENTVOL, vp->ch);
                         if (! val)
                                 bp = best + V_OFF;
@@ -349,7 +349,7 @@ start_voice(snd_emux_voice_t *vp)
         }
 
         /* channel to be silent and idle */
-        snd_emu10k1_ptr_write(hw, DCYSUSV, ch, 0x0080);
+        snd_emu10k1_ptr_write(hw, DCYSUSV, ch, 0x0000);
         snd_emu10k1_ptr_write(hw, VTFT, ch, 0x0000FFFF);
         snd_emu10k1_ptr_write(hw, CVCF, ch, 0x0000FFFF);
         snd_emu10k1_ptr_write(hw, PTRX, ch, 0);
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index ad15755a63c3..cbb689474e7d 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -759,10 +759,8 @@ static int snd_emu10k1x_free(emu10k1x_t *chip)
         outl(HCFG_LOCKSOUNDCACHE, chip->port + HCFG);
 
         // release the i/o port
-        if (chip->res_port) {
-                release_resource(chip->res_port);
-                kfree_nocheck(chip->res_port);
-        }
+        release_and_free_resource(chip->res_port);
+
         // release the irq
         if (chip->irq >= 0)
                 free_irq(chip->irq, (void *)chip);
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 646b5d972e6f..03e8c1678952 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -364,12 +364,18 @@ static int snd_emu10k1_gpr_ctl_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value
                         snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[i], 0, db_table[val]);
                         break;
                 case EMU10K1_GPR_TRANSLATION_BASS:
-                        snd_runtime_check((ctl->count % 5) == 0 && (ctl->count / 5) == ctl->vcount, change = -EIO; goto __error);
+                        if ((ctl->count % 5) != 0 || (ctl->count / 5) != ctl->vcount) {
+                                change = -EIO;
+                                goto __error;
+                        }
                         for (j = 0; j < 5; j++)
                                 snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[j * ctl->vcount + i], 0, bass_table[val][j]);
                         break;
                 case EMU10K1_GPR_TRANSLATION_TREBLE:
-                        snd_runtime_check((ctl->count % 5) == 0 && (ctl->count / 5) == ctl->vcount, change = -EIO; goto __error);
+                        if ((ctl->count % 5) != 0 || (ctl->count / 5) != ctl->vcount) {
+                                change = -EIO;
+                                goto __error;
+                        }
                         for (j = 0; j < 5; j++)
                                 snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[j * ctl->vcount + i], 0, treble_table[val][j]);
                         break;
@@ -412,8 +418,6 @@ int snd_emu10k1_fx8010_register_irq_handler(emu10k1_t *emu,
         snd_emu10k1_fx8010_irq_t *irq;
         unsigned long flags;
         
-        snd_runtime_check(emu, return -EINVAL);
-        snd_runtime_check(handler, return -EINVAL);
         irq = kmalloc(sizeof(*irq), GFP_ATOMIC);
         if (irq == NULL)
                 return -ENOMEM;
@@ -442,7 +446,6 @@ int snd_emu10k1_fx8010_unregister_irq_handler(emu10k1_t *emu,
         snd_emu10k1_fx8010_irq_t *tmp;
         unsigned long flags;
         
-        snd_runtime_check(irq, return -EINVAL);
         spin_lock_irqsave(&emu->fx8010.irq_lock, flags);
         if ((tmp = emu->fx8010.irq_handlers) == irq) {
                 emu->fx8010.irq_handlers = tmp->next;
@@ -717,9 +720,15 @@ static int snd_emu10k1_add_controls(emu10k1_t *emu, emu10k1_fx8010_code_t *icode
                         err = -EFAULT;
                         goto __error;
                 }
-                snd_runtime_check(gctl->id.iface == SNDRV_CTL_ELEM_IFACE_MIXER ||
-                                  gctl->id.iface == SNDRV_CTL_ELEM_IFACE_PCM, err = -EINVAL; goto __error);
-                snd_runtime_check(gctl->id.name[0] != '\0', err = -EINVAL; goto __error);
+                if (gctl->id.iface != SNDRV_CTL_ELEM_IFACE_MIXER &&
+                    gctl->id.iface != SNDRV_CTL_ELEM_IFACE_PCM) {
+                        err = -EINVAL;
+                        goto __error;
+                }
+                if (! gctl->id.name[0]) {
+                        err = -EINVAL;
+                        goto __error;
+                }
                 ctl = snd_emu10k1_look_for_ctl(emu, &gctl->id);
                 memset(&knew, 0, sizeof(knew));
                 knew.iface = gctl->id.iface;
@@ -783,7 +792,8 @@ static int snd_emu10k1_del_controls(emu10k1_t *emu, emu10k1_fx8010_code_t *icode
         
         for (i = 0, _id = icode->gpr_del_controls;
              i < icode->gpr_del_control_count; i++, _id++) {
-                snd_runtime_check(copy_from_user(&id, _id, sizeof(id)) == 0, return -EFAULT);
+                if (copy_from_user(&id, _id, sizeof(id)))
+                        return -EFAULT;
                 down_write(&card->controls_rwsem);
                 ctl = snd_emu10k1_look_for_ctl(emu, &id);
                 if (ctl)
@@ -964,8 +974,8 @@ static int snd_emu10k1_ipcm_peek(emu10k1_t *emu, emu10k1_fx8010_pcm_t *ipcm)
         return err;
 }
 
-#define SND_EMU10K1_GPR_CONTROLS        41
-#define SND_EMU10K1_INPUTS              10
+#define SND_EMU10K1_GPR_CONTROLS        44
+#define SND_EMU10K1_INPUTS              12
 #define SND_EMU10K1_PLAYBACK_CHANNELS   8
 #define SND_EMU10K1_CAPTURE_CHANNELS    4
 
@@ -1382,7 +1392,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
                 A_SWITCH(icode, &ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);
                 if ((z==1) && (emu->card_capabilities->spdif_bug)) {
                         /* Due to a SPDIF output bug on some Audigy cards, this code delays the Right channel by 1 sample */
-                        snd_printk("Installing spdif_bug patch: %s\n", emu->card_capabilities->name);
+                        snd_printk(KERN_INFO "Installing spdif_bug patch: %s\n", emu->card_capabilities->name);
                         A_OP(icode, &ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(gpr - 3), A_C_00000000, A_C_00000000);
                         A_OP(icode, &ptr, iACC3, A_GPR(gpr - 3), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);
                 } else {
@@ -1527,7 +1537,7 @@ static int __devinit _snd_emu10k1_init_efx(emu10k1_t *emu)
 
         strcpy(icode->name, "SB Live! FX8010 code for ALSA v1.2 by Jaroslav Kysela");
         ptr = 0; i = 0;
-        /* we have 10 inputs */
+        /* we have 12 inputs */
         playback = SND_EMU10K1_INPUTS;
         /* we have 6 playback channels and tone control doubles */
         capture = playback + (SND_EMU10K1_PLAYBACK_CHANNELS * 2);
@@ -1551,6 +1561,8 @@ static int __devinit _snd_emu10k1_init_efx(emu10k1_t *emu)
         OP(icode, &ptr, iMACINT0, GPR(7), C_00000000, FXBUS(FXBUS_PCM_LFE), C_00000004);
         OP(icode, &ptr, iMACINT0, GPR(8), C_00000000, C_00000000, C_00000000);  /* S/PDIF left */
         OP(icode, &ptr, iMACINT0, GPR(9), C_00000000, C_00000000, C_00000000);  /* S/PDIF right */
+        OP(icode, &ptr, iMACINT0, GPR(10), C_00000000, FXBUS(FXBUS_PCM_LEFT_FRONT), C_00000004);
+        OP(icode, &ptr, iMACINT0, GPR(11), C_00000000, FXBUS(FXBUS_PCM_RIGHT_FRONT), C_00000004);
 
         /* Raw S/PDIF PCM */
         ipcm->substream = 0;
@@ -1697,6 +1709,21 @@ static int __devinit _snd_emu10k1_init_efx(emu10k1_t *emu)
         VOLUME_ADD(icode, &ptr, playback + 5, 7, gpr);
         snd_emu10k1_init_mono_control(controls + i++, "LFE Digital Playback Volume", gpr++, 100);
 
+        /* Front Playback Volume */
+        for (z = 0; z < 2; z++)
+                VOLUME_ADD(icode, &ptr, playback + z, 10 + z, gpr + z);
+        snd_emu10k1_init_stereo_control(controls + i++, "Front Playback Volume", gpr, 100);
+        gpr += 2;
+
+        /* Front Capture Volume + Switch */
+        for (z = 0; z < 2; z++) {
+                SWITCH(icode, &ptr, tmp + 0, 10 + z, gpr + 2);
+                VOLUME_ADD(icode, &ptr, capture + z, tmp + 0, gpr + z);
+        }
+        snd_emu10k1_init_stereo_control(controls + i++, "Front Capture Volume", gpr, 0);
+        snd_emu10k1_init_mono_onoff_control(controls + i++, "Front Capture Switch", gpr + 2, 0);
+        gpr += 3;
+
         /*
          *  Process inputs
          */
@@ -2058,14 +2085,16 @@ void snd_emu10k1_free_efx(emu10k1_t *emu)
 #if 0 // FIXME: who use them?
 int snd_emu10k1_fx8010_tone_control_activate(emu10k1_t *emu, int output)
 {
-        snd_runtime_check(output >= 0 && output < 6, return -EINVAL);
+        if (output < 0 || output >= 6)
+                return -EINVAL;
         snd_emu10k1_ptr_write(emu, emu->gpr_base + 0x94 + output, 0, 1);
         return 0;
 }
 
 int snd_emu10k1_fx8010_tone_control_deactivate(emu10k1_t *emu, int output)
 {
-        snd_runtime_check(output >= 0 && output < 6, return -EINVAL);
+        if (output < 0 || output >= 6)
+                return -EINVAL;
         snd_emu10k1_ptr_write(emu, emu->gpr_base + 0x94 + output, 0, 0);
         return 0;
 }
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 66ba27afe962..bf7490dae09b 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -965,7 +965,8 @@ static void snd_emu10k1_pcm_mixer_notify1(emu10k1_t *emu, snd_kcontrol_t *kctl,
 {
         snd_ctl_elem_id_t id;
 
-        snd_runtime_check(kctl != NULL, return);
+        if (! kctl)
+                return;
         if (activate)
                 kctl->vd[idx].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
         else
diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
index cd8460d56752..594ea063b140 100644
--- a/sound/pci/emu10k1/irq.c
+++ b/sound/pci/emu10k1/irq.c
@@ -41,7 +41,7 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 orig_status = status;
                 handled = 1;
                 if (status & IPR_PCIERROR) {
-                        snd_printk("interrupt: PCI error\n");
+                        snd_printk(KERN_ERR "interrupt: PCI error\n");
                         snd_emu10k1_intr_disable(emu, INTE_PCIERRORENABLE);
                         status &= ~IPR_PCIERROR;
                 }
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 6afeaeab3e13..d42e4aeaa73a 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -232,11 +232,11 @@ __found_pages:
 static int is_valid_page(emu10k1_t *emu, dma_addr_t addr)
 {
         if (addr & ~emu->dma_mask) {
-                snd_printk("max memory size is 0x%lx (addr = 0x%lx)!!\n", emu->dma_mask, (unsigned long)addr);
+                snd_printk(KERN_ERR "max memory size is 0x%lx (addr = 0x%lx)!!\n", emu->dma_mask, (unsigned long)addr);
                 return 0;
         }
         if (addr & (EMUPAGESIZE-1)) {
-                snd_printk("page is not aligned\n");
+                snd_printk(KERN_ERR "page is not aligned\n");
                 return 0;
         }
         return 1;
@@ -501,7 +501,7 @@ static inline void *offset_ptr(emu10k1_t *emu, int page, int offset)
         snd_assert(page >= 0 && page < emu->max_cache_pages, return NULL);
         ptr = emu->page_ptr_table[page];
         if (! ptr) {
-                printk("emu10k1: access to NULL ptr: page = %d\n", page);
+                printk(KERN_ERR "emu10k1: access to NULL ptr: page = %d\n", page);
                 return NULL;
         }
         ptr += offset & (PAGE_SIZE - 1);
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index d59c7f345ad6..e27ebb9bb74a 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -546,7 +546,7 @@ snd_p16v_pcm_pointer_capture(snd_pcm_substream_t *substream)
         ptr=ptr2;
         if (ptr >= runtime->buffer_size) {
                 ptr -= runtime->buffer_size;
-                printk("buffer capture limited!\n");
+                printk(KERN_WARNING "buffer capture limited!\n");
         }
         //printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate);