diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-26 18:13:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-26 18:13:04 +0100 |
| commit | d0d2c38e3963f4f86a9e62d74f45a371458f2787 (patch) | |
| tree | 8ab868d67fcd4151e9b7a8158edc0cb2e1a19f66 /sound/pci | |
| parent | cf944ee55cc318bdb1d4b2f3f5cce3257f7c07b3 (diff) | |
| parent | e7636925789b042ff9d98c51d48392e8c5549480 (diff) | |
| download | linux-d0d2c38e3963f4f86a9e62d74f45a371458f2787.tar.gz linux-d0d2c38e3963f4f86a9e62d74f45a371458f2787.tar.bz2 linux-d0d2c38e3963f4f86a9e62d74f45a371458f2787.zip | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index cecd3c108990..865715e3f938 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -2458,6 +2458,12 @@ static struct hda_verb ad1988_spdif_init_verbs[] = { { } }; +static struct hda_verb ad1988_spdif_in_init_verbs[] = { + /* unmute SPDIF input pin */ + {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, + { } +}; + /* AD1989 has no ADC -> SPDIF route */ static struct hda_verb ad1989_spdif_init_verbs[] = { /* SPDIF-1 out pin */ @@ -3193,8 +3199,11 @@ static int patch_ad1988(struct hda_codec *codec) ad1988_spdif_init_verbs; } } - if (spec->dig_in_nid && codec->vendor_id < 0x11d4989a) + if (spec->dig_in_nid && codec->vendor_id < 0x11d4989a) { spec->mixers[spec->num_mixers++] = ad1988_spdif_in_mixers; + spec->init_verbs[spec->num_init_verbs++] = + ad1988_spdif_in_init_verbs; + } codec->patch_ops = ad198x_patch_ops; switch (board_config) { |