17 files changed, 213 insertions, 138 deletions

diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index dac3633507c9..a68aed7fce02 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -441,19 +441,22 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg)
                 params = kmalloc(sizeof(*params), GFP_KERNEL);
                 if (!params)
                         return -ENOMEM;
-                if (copy_from_user(params, (void __user *)arg, sizeof(*params)))
-                        return -EFAULT;
+                if (copy_from_user(params, (void __user *)arg, sizeof(*params))) {
+                        retval = -EFAULT;
+                        goto out;
+                }
                 retval = snd_compr_allocate_buffer(stream, params);
                 if (retval) {
-                        kfree(params);
-                        return -ENOMEM;
+                        retval = -ENOMEM;
+                        goto out;
                 }
                 retval = stream->ops->set_params(stream, params);
                 if (retval)
                         goto out;
                 stream->runtime->state = SNDRV_PCM_STATE_SETUP;
-        } else
+        } else {
                 return -EPERM;
+        }
 out:
         kfree(params);
         return retval;
diff --git a/sound/pci/hda/alc880_quirks.c b/sound/pci/hda/alc880_quirks.c
index 5b68435d195b..501501ef36a9 100644
--- a/sound/pci/hda/alc880_quirks.c
+++ b/sound/pci/hda/alc880_quirks.c
@@ -762,16 +762,22 @@ static void alc880_uniwill_unsol_event(struct hda_codec *codec,
         /* Looks like the unsol event is incompatible with the standard
          * definition.  4bit tag is placed at 28 bit!
          */
-        switch (res >> 28) {
+        res >>= 28;
+        switch (res) {
         case ALC_MIC_EVENT:
                 alc88x_simple_mic_automute(codec);
                 break;
         default:
-                alc_sku_unsol_event(codec, res);
+                alc_exec_unsol_event(codec, res);
                 break;
         }
 }
 
+static void alc880_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        alc_exec_unsol_event(codec, res >> 28);
+}
+
 static void alc880_uniwill_p53_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -800,10 +806,11 @@ static void alc880_uniwill_p53_unsol_event(struct hda_codec *codec,
         /* Looks like the unsol event is incompatible with the standard
          * definition.  4bit tag is placed at 28 bit!
          */
-        if ((res >> 28) == ALC_DCVOL_EVENT)
+        res >>= 28;
+        if (res == ALC_DCVOL_EVENT)
                 alc880_uniwill_p53_dcvol_automute(codec);
         else
-                alc_sku_unsol_event(codec, res);
+                alc_exec_unsol_event(codec, res);
 }
 
 /*
@@ -1677,7 +1684,7 @@ static const struct alc_config_preset alc880_presets[] = {
                 .channel_mode = alc880_lg_ch_modes,
                 .need_dac_fix = 1,
                 .input_mux = &alc880_lg_capture_source,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc880_unsol_event,
                 .setup = alc880_lg_setup,
                 .init_hook = alc_hp_automute,
 #ifdef CONFIG_SND_HDA_POWER_SAVE
diff --git a/sound/pci/hda/alc882_quirks.c b/sound/pci/hda/alc882_quirks.c
index bdf0ed4ab3e2..bb364a53f546 100644
--- a/sound/pci/hda/alc882_quirks.c
+++ b/sound/pci/hda/alc882_quirks.c
@@ -730,6 +730,11 @@ static void alc889A_mb31_unsol_event(struct hda_codec *codec, unsigned int res)
                 alc889A_mb31_automute(codec);
 }
 
+static void alc882_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        alc_exec_unsol_event(codec, res >> 26);
+}
+
 /*
  * configuration and preset
  */
@@ -775,7 +780,7 @@ static const struct alc_config_preset alc882_presets[] = {
                         .channel_mode = alc885_mba21_ch_modes,
                         .num_channel_mode = ARRAY_SIZE(alc885_mba21_ch_modes),
                         .input_mux = &alc882_capture_source,
-                        .unsol_event = alc_sku_unsol_event,
+                        .unsol_event = alc882_unsol_event,
                         .setup = alc885_mba21_setup,
                         .init_hook = alc_hp_automute,
        },
@@ -791,7 +796,7 @@ static const struct alc_config_preset alc882_presets[] = {
                 .input_mux = &alc882_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc882_unsol_event,
                 .setup = alc885_mbp3_setup,
                 .init_hook = alc_hp_automute,
         },
@@ -806,7 +811,7 @@ static const struct alc_config_preset alc882_presets[] = {
                 .input_mux = &mb5_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc882_unsol_event,
                 .setup = alc885_mb5_setup,
                 .init_hook = alc_hp_automute,
         },
@@ -821,7 +826,7 @@ static const struct alc_config_preset alc882_presets[] = {
                 .input_mux = &macmini3_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc882_unsol_event,
                 .setup = alc885_macmini3_setup,
                 .init_hook = alc_hp_automute,
         },
@@ -836,7 +841,7 @@ static const struct alc_config_preset alc882_presets[] = {
                 .input_mux = &alc889A_imac91_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc882_unsol_event,
                 .setup = alc885_imac91_setup,
                 .init_hook = alc_hp_automute,
         },
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index fb35474c1203..95dfb6874941 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -469,6 +469,7 @@ struct azx {
         unsigned int irq_pending_warned :1;
         unsigned int probing :1; /* codec probing phase */
         unsigned int snoop:1;
+        unsigned int align_buffer_size:1;
 
         /* for debugging */
         unsigned int last_cmd[AZX_MAX_CODECS];
@@ -1690,7 +1691,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         runtime->hw.rates = hinfo->rates;
         snd_pcm_limit_hw_rates(runtime);
         snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
-        if (align_buffer_size)
+        if (chip->align_buffer_size)
                 /* constrain buffer sizes to be multiple of 128
                    bytes. This is more efficient in terms of memory
                    access but isn't required by the HDA spec and
@@ -2773,8 +2774,9 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         }
 
         /* disable buffer size rounding to 128-byte multiples if supported */
+        chip->align_buffer_size = align_buffer_size;
         if (chip->driver_caps & AZX_DCAPS_BUFSIZE)
-                align_buffer_size = 0;
+                chip->align_buffer_size = 0;
 
         /* allow 64bit DMA address if supported by H/W */
         if ((gcap & ICH6_GCAP_64OK) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64)))
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 8a32a69c83c3..a7a5733aa4d2 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3027,7 +3027,7 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),
-        SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo T510", CXT5066_AUTO),
         SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520 & W520", CXT5066_AUTO),
         SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD),
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 5e82acf77c5a..0db1dc49382b 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -185,7 +185,6 @@ struct alc_spec {
         unsigned int vol_in_capsrc:1; /* use capsrc volume (ADC has no vol) */
         unsigned int parse_flags; /* passed to snd_hda_parse_pin_defcfg() */
         unsigned int shared_mic_hp:1; /* HP/Mic-in sharing */
-        unsigned int use_jack_tbl:1; /* 1 for model=auto */
 
         /* auto-mute control */
         int automute_mode;
@@ -621,17 +620,10 @@ static void alc_mic_automute(struct hda_codec *codec)
                 alc_mux_select(codec, 0, spec->int_mic_idx, false);
 }
 
-/* unsolicited event for HP jack sensing */
-static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
+/* handle the specified unsol action (ALC_XXX_EVENT) */
+static void alc_exec_unsol_event(struct hda_codec *codec, int action)
 {
-        struct alc_spec *spec = codec->spec;
-        if (codec->vendor_id == 0x10ec0880)
-                res >>= 28;
-        else
-                res >>= 26;
-        if (spec->use_jack_tbl)
-                res = snd_hda_jack_get_action(codec, res);
-        switch (res) {
+        switch (action) {
         case ALC_HP_EVENT:
                 alc_hp_automute(codec);
                 break;
@@ -645,6 +637,17 @@ static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
         snd_hda_jack_report_sync(codec);
 }
 
+/* unsolicited event for HP jack sensing */
+static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        if (codec->vendor_id == 0x10ec0880)
+                res >>= 28;
+        else
+                res >>= 26;
+        res = snd_hda_jack_get_action(codec, res);
+        alc_exec_unsol_event(codec, res);
+}
+
 /* call init functions of standard auto-mute helpers */
 static void alc_inithook(struct hda_codec *codec)
 {
@@ -1883,7 +1886,7 @@ static const struct snd_kcontrol_new alc_beep_mixer[] = {
 };
 #endif
 
-static int alc_build_controls(struct hda_codec *codec)
+static int __alc_build_controls(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         struct snd_kcontrol *kctl = NULL;
@@ -2029,11 +2032,16 @@ static int alc_build_controls(struct hda_codec *codec)
 
         alc_free_kctls(codec); /* no longer needed */
 
-        err = snd_hda_jack_add_kctls(codec, &spec->autocfg);
+        return 0;
+}
+
+static int alc_build_controls(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int err = __alc_build_controls(codec);
         if (err < 0)
                 return err;
-
-        return 0;
+        return snd_hda_jack_add_kctls(codec, &spec->autocfg);
 }
 
 
@@ -3233,7 +3241,7 @@ static int alc_auto_create_multi_out_ctls(struct hda_codec *codec,
         int i, err, noutputs;
 
         noutputs = cfg->line_outs;
-        if (spec->multi_ios > 0)
+        if (spec->multi_ios > 0 && cfg->line_outs < 3)
                 noutputs += spec->multi_ios;
 
         for (i = 0; i < noutputs; i++) {
@@ -3904,7 +3912,6 @@ static void set_capture_mixer(struct hda_codec *codec)
 static void alc_auto_init_std(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        spec->use_jack_tbl = 1;
         alc_auto_init_multi_out(codec);
         alc_auto_init_extra_out(codec);
         alc_auto_init_analog_input(codec);
@@ -4168,6 +4175,8 @@ static int patch_alc880(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC_MODEL_AUTO)
                 spec->init_hook = alc_auto_init_std;
+        else
+                codec->patch_ops.build_controls = __alc_build_controls;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc880_loopbacks;
@@ -4297,6 +4306,8 @@ static int patch_alc260(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC_MODEL_AUTO)
                 spec->init_hook = alc_auto_init_std;
+        else
+                codec->patch_ops.build_controls = __alc_build_controls;
         spec->shutup = alc_eapd_shutup;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
@@ -4691,6 +4702,8 @@ static int patch_alc882(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC_MODEL_AUTO)
                 spec->init_hook = alc_auto_init_std;
+        else
+                codec->patch_ops.build_controls = __alc_build_controls;
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
@@ -5573,6 +5586,7 @@ static const struct hda_amp_list alc861_loopbacks[] = {
 /* Pin config fixes */
 enum {
         PINFIX_FSC_AMILO_PI1505,
+        PINFIX_ASUS_A6RP,
 };
 
 static const struct alc_fixup alc861_fixups[] = {
@@ -5584,9 +5598,19 @@ static const struct alc_fixup alc861_fixups[] = {
                         { }
                 }
         },
+        [PINFIX_ASUS_A6RP] = {
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        /* node 0x0f VREF seems controlling the master output */
+                        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
+                        { }
+                },
+        },
 };
 
 static const struct snd_pci_quirk alc861_fixup_tbl[] = {
+        SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", PINFIX_ASUS_A6RP),
+        SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", PINFIX_ASUS_A6RP),
         SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505),
         {}
 };
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 3556408d6ece..948f0be2f4f3 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1608,7 +1608,7 @@ static const struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x043a,
                       "Alienware M17x", STAC_ALIENWARE_M17X),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490,
-                      "Alienware M17x", STAC_ALIENWARE_M17X),
+                      "Alienware M17x R3", STAC_DELL_EQ),
         {} /* terminator */
 };
 
@@ -4163,13 +4163,15 @@ static int enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
         return 1;
 }
 
-static int is_nid_hp_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)
+static int is_nid_out_jack_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)
 {
         int i;
         for (i = 0; i < cfg->hp_outs; i++)
                 if (cfg->hp_pins[i] == nid)
                         return 1; /* nid is a HP-Out */
-
+        for (i = 0; i < cfg->line_outs; i++)
+                if (cfg->line_out_pins[i] == nid)
+                        return 1; /* nid is a line-Out */
         return 0; /* nid is not a HP-Out */
 };
 
@@ -4375,7 +4377,7 @@ static int stac92xx_init(struct hda_codec *codec)
                         continue;
                 }
 
-                if (is_nid_hp_pin(cfg, nid))
+                if (is_nid_out_jack_pin(cfg, nid))
                         continue; /* already has an unsol event */
 
                 pinctl = snd_hda_codec_read(codec, nid, 0,
@@ -4868,7 +4870,14 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)
                         /* BIOS bug: unfilled OEM string */
                         if (strstr(dev->name, "HP_Mute_LED_P_G")) {
                                 set_hp_led_gpio(codec);
-                                spec->gpio_led_polarity = 1;
+                                switch (codec->subsystem_id) {
+                                case 0x103c148a:
+                                        spec->gpio_led_polarity = 0;
+                                        break;
+                                default:
+                                        spec->gpio_led_polarity = 1;
+                                        break;
+                                }
                                 return 1;
                         }
                 }
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index e57b89e8aa89..94ab728f5ca8 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -286,17 +286,22 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_ymfpci_pcm_4ch(chip, 2, NULL)) < 0) {
+        err = snd_ymfpci_mixer(chip, rear_switch[dev]);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_ymfpci_pcm2(chip, 3, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_ymfpci_mixer(chip, rear_switch[dev])) < 0) {
-                snd_card_free(card);
-                return err;
+        if (chip->ac97->ext_id & AC97_EI_SDAC) {
+                err = snd_ymfpci_pcm_4ch(chip, 2, NULL);
+                if (err < 0) {
+                        snd_card_free(card);
+                        return err;
+                }
+                err = snd_ymfpci_pcm2(chip, 3, NULL);
+                if (err < 0) {
+                        snd_card_free(card);
+                        return err;
+                }
         }
         if ((err = snd_ymfpci_timer(chip, 0)) < 0) {
                 snd_card_free(card);
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 03ee4e365311..12a9a2b03387 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -1614,6 +1614,14 @@ static int snd_ymfpci_put_dup4ch(struct snd_kcontrol *kcontrol, struct snd_ctl_e
         return change;
 }
 
+static struct snd_kcontrol_new snd_ymfpci_dup4ch __devinitdata = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "4ch Duplication",
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+        .info = snd_ymfpci_info_dup4ch,
+        .get = snd_ymfpci_get_dup4ch,
+        .put = snd_ymfpci_put_dup4ch,
+};
 
 static struct snd_kcontrol_new snd_ymfpci_controls[] __devinitdata = {
 {
@@ -1642,13 +1650,6 @@ YMFPCI_DOUBLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,VOLUME), 1, YDSXGR_SPDIFLOOPVOL),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), 0, YDSXGR_SPDIFOUTCTRL, 0),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, YDSXGR_SPDIFINCTRL, 0),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("Loop",NONE,NONE), 0, YDSXGR_SPDIFINCTRL, 4),
-{
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "4ch Duplication",
-        .info = snd_ymfpci_info_dup4ch,
-        .get = snd_ymfpci_get_dup4ch,
-        .put = snd_ymfpci_put_dup4ch,
-},
 };
 
 
@@ -1838,6 +1839,12 @@ int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch)
                 if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_ymfpci_controls[idx], chip))) < 0)
                         return err;
         }
+        if (chip->ac97->ext_id & AC97_EI_SDAC) {
+                kctl = snd_ctl_new1(&snd_ymfpci_dup4ch, chip);
+                err = snd_ctl_add(chip->card, kctl);
+                if (err < 0)
+                        return err;
+        }
 
         /* add S/PDIF control */
         if (snd_BUG_ON(!chip->pcm_spdif))
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index f8863ebb4304..7f4ba819a9f6 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -987,12 +987,12 @@ static int sgtl5000_restore_regs(struct snd_soc_codec *codec)
         /* restore regular registers */
         for (reg = 0; reg <= SGTL5000_CHIP_SHORT_CTRL; reg += 2) {
 
-                /* this regs depends on the others */
+                /* These regs should restore in particular order */
                 if (reg == SGTL5000_CHIP_ANA_POWER ||
                         reg == SGTL5000_CHIP_CLK_CTRL ||
                         reg == SGTL5000_CHIP_LINREG_CTRL ||
                         reg == SGTL5000_CHIP_LINE_OUT_CTRL ||
-                        reg == SGTL5000_CHIP_CLK_CTRL)
+                        reg == SGTL5000_CHIP_REF_CTRL)
                         continue;
 
                 snd_soc_write(codec, reg, cache[reg]);
@@ -1003,8 +1003,17 @@ static int sgtl5000_restore_regs(struct snd_soc_codec *codec)
                 snd_soc_write(codec, reg, cache[reg]);
 
         /*
-         * restore power and other regs according
-         * to set_power() and set_clock()
+         * restore these regs according to the power setting sequence in
+         * sgtl5000_set_power_regs() and clock setting sequence in
+         * sgtl5000_set_clock().
+         *
+         * The order of restore is:
+         * 1. SGTL5000_CHIP_CLK_CTRL MCLK_FREQ bits (1:0) should be restore after
+         *    SGTL5000_CHIP_ANA_POWER PLL bits set
+         * 2. SGTL5000_CHIP_LINREG_CTRL should be set before
+         *    SGTL5000_CHIP_ANA_POWER LINREG_D restored
+         * 3. SGTL5000_CHIP_REF_CTRL controls Analog Ground Voltage,
+         *    prefer to resotre it after SGTL5000_CHIP_ANA_POWER restored
          */
         snd_soc_write(codec, SGTL5000_CHIP_LINREG_CTRL,
                         cache[SGTL5000_CHIP_LINREG_CTRL]);
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index eb401ef021fb..372b0b83bd9f 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -60,7 +60,6 @@ struct aic32x4_rate_divs {
 
 struct aic32x4_priv {
         u32 sysclk;
-        s32 master;
         u8 page_no;
         void *control_data;
         u32 power_cfg;
@@ -369,7 +368,6 @@ static int aic32x4_set_dai_sysclk(struct snd_soc_dai *codec_dai,
 static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 {
         struct snd_soc_codec *codec = codec_dai->codec;
-        struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
         u8 iface_reg_1;
         u8 iface_reg_2;
         u8 iface_reg_3;
@@ -384,11 +382,9 @@ static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
         /* set master/slave audio interface */
         switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
         case SND_SOC_DAIFMT_CBM_CFM:
-                aic32x4->master = 1;
                 iface_reg_1 |= AIC32X4_BCLKMASTER | AIC32X4_WCLKMASTER;
                 break;
         case SND_SOC_DAIFMT_CBS_CFS:
-                aic32x4->master = 0;
                 break;
         default:
                 printk(KERN_ERR "aic32x4: invalid DAI master/slave interface\n");
@@ -526,64 +522,58 @@ static int aic32x4_mute(struct snd_soc_dai *dai, int mute)
 static int aic32x4_set_bias_level(struct snd_soc_codec *codec,
                                   enum snd_soc_bias_level level)
 {
-        struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
-
         switch (level) {
         case SND_SOC_BIAS_ON:
-                if (aic32x4->master) {
-                        /* Switch on PLL */
-                        snd_soc_update_bits(codec, AIC32X4_PLLPR,
-                                            AIC32X4_PLLEN, AIC32X4_PLLEN);
-
-                        /* Switch on NDAC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_NDAC,
-                                            AIC32X4_NDACEN, AIC32X4_NDACEN);
-
-                        /* Switch on MDAC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_MDAC,
-                                            AIC32X4_MDACEN, AIC32X4_MDACEN);
-
-                        /* Switch on NADC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_NADC,
-                                            AIC32X4_NADCEN, AIC32X4_NADCEN);
-
-                        /* Switch on MADC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_MADC,
-                                            AIC32X4_MADCEN, AIC32X4_MADCEN);
-
-                        /* Switch on BCLK_N Divider */
-                        snd_soc_update_bits(codec, AIC32X4_BCLKN,
-                                            AIC32X4_BCLKEN, AIC32X4_BCLKEN);
-                }
+                /* Switch on PLL */
+                snd_soc_update_bits(codec, AIC32X4_PLLPR,
+                                    AIC32X4_PLLEN, AIC32X4_PLLEN);
+
+                /* Switch on NDAC Divider */
+                snd_soc_update_bits(codec, AIC32X4_NDAC,
+                                    AIC32X4_NDACEN, AIC32X4_NDACEN);
+
+                /* Switch on MDAC Divider */
+                snd_soc_update_bits(codec, AIC32X4_MDAC,
+                                    AIC32X4_MDACEN, AIC32X4_MDACEN);
+
+                /* Switch on NADC Divider */
+                snd_soc_update_bits(codec, AIC32X4_NADC,
+                                    AIC32X4_NADCEN, AIC32X4_NADCEN);
+
+                /* Switch on MADC Divider */
+                snd_soc_update_bits(codec, AIC32X4_MADC,
+                                    AIC32X4_MADCEN, AIC32X4_MADCEN);
+
+                /* Switch on BCLK_N Divider */
+                snd_soc_update_bits(codec, AIC32X4_BCLKN,
+                                    AIC32X4_BCLKEN, AIC32X4_BCLKEN);
                 break;
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
-                if (aic32x4->master) {
-                        /* Switch off PLL */
-                        snd_soc_update_bits(codec, AIC32X4_PLLPR,
-                                            AIC32X4_PLLEN, 0);
-
-                        /* Switch off NDAC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_NDAC,
-                                            AIC32X4_NDACEN, 0);
-
-                        /* Switch off MDAC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_MDAC,
-                                            AIC32X4_MDACEN, 0);
-
-                        /* Switch off NADC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_NADC,
-                                            AIC32X4_NADCEN, 0);
-
-                        /* Switch off MADC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_MADC,
-                                            AIC32X4_MADCEN, 0);
-
-                        /* Switch off BCLK_N Divider */
-                        snd_soc_update_bits(codec, AIC32X4_BCLKN,
-                                            AIC32X4_BCLKEN, 0);
-                }
+                /* Switch off PLL */
+                snd_soc_update_bits(codec, AIC32X4_PLLPR,
+                                    AIC32X4_PLLEN, 0);
+
+                /* Switch off NDAC Divider */
+                snd_soc_update_bits(codec, AIC32X4_NDAC,
+                                    AIC32X4_NDACEN, 0);
+
+                /* Switch off MDAC Divider */
+                snd_soc_update_bits(codec, AIC32X4_MDAC,
+                                    AIC32X4_MDACEN, 0);
+
+                /* Switch off NADC Divider */
+                snd_soc_update_bits(codec, AIC32X4_NADC,
+                                    AIC32X4_NADCEN, 0);
+
+                /* Switch off MADC Divider */
+                snd_soc_update_bits(codec, AIC32X4_MADC,
+                                    AIC32X4_MADCEN, 0);
+
+                /* Switch off BCLK_N Divider */
+                snd_soc_update_bits(codec, AIC32X4_BCLKN,
+                                    AIC32X4_BCLKEN, 0);
                 break;
         case SND_SOC_BIAS_OFF:
                 break;
@@ -651,9 +641,11 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
         if (aic32x4->power_cfg & AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE) {
                 snd_soc_write(codec, AIC32X4_PWRCFG, AIC32X4_AVDDWEAKDISABLE);
         }
-        if (aic32x4->power_cfg & AIC32X4_PWR_AIC32X4_LDO_ENABLE) {
-                snd_soc_write(codec, AIC32X4_LDOCTL, AIC32X4_LDOCTLEN);
-        }
+
+        tmp_reg = (aic32x4->power_cfg & AIC32X4_PWR_AIC32X4_LDO_ENABLE) ?
+                        AIC32X4_LDOCTLEN : 0;
+        snd_soc_write(codec, AIC32X4_LDOCTL, tmp_reg);
+
         tmp_reg = snd_soc_read(codec, AIC32X4_CMMODE);
         if (aic32x4->power_cfg & AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36) {
                 tmp_reg |= AIC32X4_LDOIN_18_36;
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index c2880907fced..a75c3766aede 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -733,8 +733,9 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         struct wm2000_priv *wm2000;
         struct wm2000_platform_data *pdata;
         const char *filename;
-        const struct firmware *fw;
-        int reg, ret;
+        const struct firmware *fw = NULL;
+        int ret;
+        int reg;
         u16 id;
 
         wm2000 = devm_kzalloc(&i2c->dev, sizeof(struct wm2000_priv),
@@ -751,7 +752,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
                 ret = PTR_ERR(wm2000->regmap);
                 dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
                         ret);
-                goto err;
+                goto out;
         }
 
         /* Verify that this is a WM2000 */
@@ -763,7 +764,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         if (id != 0x2000) {
                 dev_err(&i2c->dev, "Device is not a WM2000 - ID %x\n", id);
                 ret = -ENODEV;
-                goto err_regmap;
+                goto out_regmap_exit;
         }
 
         reg = wm2000_read(i2c, WM2000_REG_REVISON);
@@ -782,7 +783,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         ret = request_firmware(&fw, filename, &i2c->dev);
         if (ret != 0) {
                 dev_err(&i2c->dev, "Failed to acquire ANC data: %d\n", ret);
-                goto err_regmap;
+                goto out_regmap_exit;
         }
 
         /* Pre-cook the concatenation of the register address onto the image */
@@ -793,15 +794,13 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         if (wm2000->anc_download == NULL) {
                 dev_err(&i2c->dev, "Out of memory\n");
                 ret = -ENOMEM;
-                goto err_fw;
+                goto out_regmap_exit;
         }
 
         wm2000->anc_download[0] = 0x80;
         wm2000->anc_download[1] = 0x00;
         memcpy(wm2000->anc_download + 2, fw->data, fw->size);
 
-        release_firmware(fw);
-
         wm2000->anc_eng_ena = 1;
         wm2000->anc_active = 1;
         wm2000->spk_ena = 1;
@@ -809,18 +808,14 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
 
         wm2000_reset(wm2000);
 
-        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm2000,
-                                     NULL, 0);
-        if (ret != 0)
-                goto err_fw;
+        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm2000, NULL, 0);
+        if (!ret)
+                goto out;
 
-        return 0;
-
-err_fw:
-        release_firmware(fw);
-err_regmap:
+out_regmap_exit:
         regmap_exit(wm2000->regmap);
-err:
+out:
+        release_firmware(fw);
         return ret;
 }
 
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 8b24323d6b2c..66f0611e68b6 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1377,6 +1377,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
 
                         switch (wm5100->rev) {
                         case 0:
+                                regcache_cache_bypass(wm5100->regmap, true);
                                 snd_soc_write(codec, 0x11, 0x3);
                                 snd_soc_write(codec, 0x203, 0xc);
                                 snd_soc_write(codec, 0x206, 0);
@@ -1392,6 +1393,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
                                         snd_soc_write(codec,
                                                       wm5100_reva_patches[i].reg,
                                                       wm5100_reva_patches[i].val);
+                                regcache_cache_bypass(wm5100->regmap, false);
                                 break;
                         default:
                                 break;
@@ -1402,6 +1404,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_OFF:
+                regcache_cache_only(wm5100->regmap, true);
                 if (wm5100->pdata.ldo_ena)
                         gpio_set_value_cansleep(wm5100->pdata.ldo_ena, 0);
                 regulator_bulk_disable(ARRAY_SIZE(wm5100->core_supplies),
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index 8d4ea43d40a3..40ac888faf3d 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -55,7 +55,7 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
                 return 0;
 
         if (fw->size < 32) {
-                dev_err(codec->dev, "%s: firmware too short (%d bytes)\n",
+                dev_err(codec->dev, "%s: firmware too short (%zd bytes)\n",
                         name, fw->size);
                 goto err;
         }
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index d8da10fe5b52..13aa2bdaa7d7 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -1120,7 +1120,8 @@ SND_SOC_DAPM_SUPPLY_S("SYSCLK", 1, WM8996_AIF_CLOCKING_1, 0, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY_S("SYSDSPCLK", 2, WM8996_CLOCKING_1, 1, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY_S("AIFCLK", 2, WM8996_CLOCKING_1, 2, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY_S("Charge Pump", 2, WM8996_CHARGE_PUMP_1, 15, 0, cp_event,
-                      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+                      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                      SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("Bandgap", SND_SOC_NOPM, 0, 0, bg_event,
                     SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("LDO2", WM8996_POWER_MANAGEMENT_2, 1, 0, NULL, 0),
@@ -2007,6 +2008,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai,
         struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
         int lfclk = 0;
         int ratediv = 0;
+        int sync = WM8996_REG_SYNC;
         int src;
         int old;
 
@@ -2051,6 +2053,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai,
         case 32000:
         case 32768:
                 lfclk = WM8996_LFCLK_ENA;
+                sync = 0;
                 break;
         default:
                 dev_warn(codec->dev, "Unsupported clock rate %dHz\n",
@@ -2064,6 +2067,8 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai,
                             WM8996_SYSCLK_SRC_MASK | WM8996_SYSCLK_DIV_MASK,
                             src << WM8996_SYSCLK_SRC_SHIFT | ratediv);
         snd_soc_update_bits(codec, WM8996_CLOCKING_1, WM8996_LFCLK_ENA, lfclk);
+        snd_soc_update_bits(codec, WM8996_CONTROL_INTERFACE_1,
+                            WM8996_REG_SYNC, sync);
         snd_soc_update_bits(codec, WM8996_AIF_CLOCKING_1,
                             WM8996_SYSCLK_ENA, old);
 
diff --git a/sound/soc/codecs/wm8996.h b/sound/soc/codecs/wm8996.h
index 0fde643194ce..de9ac3e44aec 100644
--- a/sound/soc/codecs/wm8996.h
+++ b/sound/soc/codecs/wm8996.h
@@ -1567,6 +1567,10 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
 /*
  * R257 (0x101) - Control Interface (1)
  */
+#define WM8996_REG_SYNC                         0x8000  /* REG_SYNC */
+#define WM8996_REG_SYNC_MASK                    0x8000  /* REG_SYNC */
+#define WM8996_REG_SYNC_SHIFT                       15  /* REG_SYNC */
+#define WM8996_REG_SYNC_WIDTH                        1  /* REG_SYNC */
 #define WM8996_AUTO_INC                         0x0004  /* AUTO_INC */
 #define WM8996_AUTO_INC_MASK                    0x0004  /* AUTO_INC */
 #define WM8996_AUTO_INC_SHIFT                        2  /* AUTO_INC */
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index dccfb37a9626..f204dbac11d4 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -124,6 +124,8 @@ static int mxs_saif_set_clk(struct mxs_saif *saif,
          *
          * If MCLK is not used, we just set saif clk to 512*fs.
          */
+        clk_prepare_enable(master_saif->clk);
+
         if (master_saif->mclk_in_use) {
                 if (mclk % 32 == 0) {
                         scr &= ~BM_SAIF_CTRL_BITCLK_BASE_RATE;
@@ -133,6 +135,7 @@ static int mxs_saif_set_clk(struct mxs_saif *saif,
                         ret = clk_set_rate(master_saif->clk, 384 * rate);
                 } else {
                         /* SAIF MCLK should be either 32x or 48x */
+                        clk_disable_unprepare(master_saif->clk);
                         return -EINVAL;
                 }
         } else {
@@ -140,6 +143,8 @@ static int mxs_saif_set_clk(struct mxs_saif *saif,
                 scr &= ~BM_SAIF_CTRL_BITCLK_BASE_RATE;
         }
 
+        clk_disable_unprepare(master_saif->clk);
+
         if (ret)
                 return ret;