summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-23 08:26:58 +0100
committerTakashi Iwai <tiwai@suse.de>2012-11-23 08:37:32 +0100
commit98415eacb35df0ebce6b9b2d52af1af66ee0b72f (patch)
tree7303c9eb6643979524221460372cba4e40b580fc /sound/pci
parent829e87e04cb5052f5748aba2788eee13ea7c2773 (diff)
downloadlinux-3.10-98415eacb35df0ebce6b9b2d52af1af66ee0b72f.tar.gz
linux-3.10-98415eacb35df0ebce6b9b2d52af1af66ee0b72f.tar.bz2
linux-3.10-98415eacb35df0ebce6b9b2d52af1af66ee0b72f.zip
ALSA: hda - Add missing verb applications in patch_cirrus.c
We forgot to apply the fixup verbs in cs_init(). But adding the fixup verbs will break mbp101 fixup that has been fixed recently again, since the mbp101 fixup contains the wrong verbs to override. So these bogus verbs must be removed, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_cirrus.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 3fb02ecd82a..6e1e711585f 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -85,7 +85,6 @@ enum {
CS420X_GPIO_13,
CS420X_GPIO_23,
CS420X_MBP101,
- CS420X_MBP101_COEF,
CS420X_AUTO,
/* aliases */
CS420X_IMAC27_122 = CS420X_GPIO_23,
@@ -1177,14 +1176,6 @@ static const struct hda_verb cs_errata_init_verbs[] = {
{} /* terminator */
};
-static const struct hda_verb mbp101_init_verbs[] = {
- {0x11, AC_VERB_SET_COEF_INDEX, 0x0002},
- {0x11, AC_VERB_SET_PROC_COEF, 0x100a},
- {0x11, AC_VERB_SET_COEF_INDEX, 0x0004},
- {0x11, AC_VERB_SET_PROC_COEF, 0x000f},
- {}
-};
-
/* SPDIF setup */
static void init_digital(struct hda_codec *codec)
{
@@ -1209,6 +1200,8 @@ static int cs_init(struct hda_codec *codec)
snd_hda_sequence_write(codec, cs_coef_init_verbs);
+ snd_hda_gen_apply_verbs(codec);
+
if (spec->gpio_mask) {
snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_MASK,
spec->gpio_mask);
@@ -1423,12 +1416,6 @@ static const struct hda_fixup cs420x_fixups[] = {
.type = HDA_FIXUP_PINS,
.v.pins = mbp101_pincfgs,
.chained = true,
- .chain_id = CS420X_MBP101_COEF,
- },
- [CS420X_MBP101_COEF] = {
- .type = HDA_FIXUP_VERBS,
- .v.verbs = mbp101_init_verbs,
- .chained = true,
.chain_id = CS420X_GPIO_13,
},
};