Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Linus Torvalds [Fri, 30 Mar 2012 17:59:52 +0000 (10:59 -0700)]
Pull sound fixes from Takashi Iwai:
 "A collection of small fixes for 3.4-rc1, including
   - mic-recording regression fix for Realtek codec
   - clean-up of dmaengine parameter mess
   - WM8894 calibration tweak
   - minor fixes for asihpi and some bool module parms"

* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: fix isa/opti9xx module param type
  sound: fix oss/msnd_pinnacle module param type
  ALSA: asihpi - fix return type of hpios_locked_mem_alloc()
  ASoC: dmaengine_pcm: use dmaengine cyclic wrapper
  ASoC: Add extra parameter to device_prep_dma_cyclic
  ALSA: hda/realtek - Fix ADC assignment with a shared HP/Mic pin
  ASoC: wm8994: Update WM8994 DCS calibration

1  2 
sound/soc/codecs/wm8994.c

@@@ -2181,9 -2181,26 +2181,9 @@@ static int wm8994_set_bias_level(struc
        case SND_SOC_BIAS_STANDBY:
                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                        switch (control->type) {
                        case WM8958:
                                if (wm8994->revision == 0) {
                                        /* Optimise performance for rev A */
 -                                      snd_soc_write(codec, 0x102, 0x3);
 -                                      snd_soc_write(codec, 0xcb, 0x81);
 -                                      snd_soc_write(codec, 0x817, 0);
 -                                      snd_soc_write(codec, 0x102, 0);
 -
                                        snd_soc_update_bits(codec,
                                                            WM8958_CHARGE_PUMP_2,
                                                            WM8958_CP_DISCH,
                                }
                                break;
  
 -                      case WM1811:
 -                              if (wm8994->revision < 2) {
 -                                      snd_soc_write(codec, 0x102, 0x3);
 -                                      snd_soc_write(codec, 0x5d, 0x7e);
 -                                      snd_soc_write(codec, 0x5e, 0x0);
 -                                      snd_soc_write(codec, 0x102, 0x0);
 -                              }
 +                      default:
                                break;
                        }
  
@@@ -3629,7 -3652,7 +3629,7 @@@ static int wm8994_codec_probe(struct sn
                case 2:
                case 3:
                        wm8994->hubs.dcs_codes_l = -9;
-                       wm8994->hubs.dcs_codes_r = -5;
+                       wm8994->hubs.dcs_codes_r = -7;
                        break;
                default:
                        break;