Skip to content

Commit

Permalink
ALSA: hda - Add missing verb applications in patch_cirrus.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Nov 23, 2012
1 parent 829e87e commit 98415ea
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions sound/pci/hda/patch_cirrus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
{
Expand All @@ -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);
Expand Down Expand Up @@ -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,
},
};
Expand Down

0 comments on commit 98415ea

Please sign in to comment.