Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353063
b: refs/heads/master
c: 973e497
h: refs/heads/master
i:
  353061: b95874b
  353059: e36e89e
  353055: 2e4087d
v: v3
  • Loading branch information
Takashi Iwai committed Jan 12, 2013
1 parent 00ff6d9 commit bcafb1a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fd25a97a97c78e7f09b0b3069a40bf7671654366
refs/heads/master: 973e4972f9f0fe8f854451f7559c847a8cdc8bc7
19 changes: 19 additions & 0 deletions trunk/sound/pci/hda/hda_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -3532,6 +3532,23 @@ static void init_digital(struct hda_codec *codec)
snd_hda_set_pin_ctl(codec, pin, PIN_IN);
}

/* clear unsol-event tags on unused pins; Conexant codecs seem to leave
* invalid unsol tags by some reason
*/
static void clear_unsol_on_unused_pins(struct hda_codec *codec)
{
int i;

for (i = 0; i < codec->init_pins.used; i++) {
struct hda_pincfg *pin = snd_array_elem(&codec->init_pins, i);
hda_nid_t nid = pin->nid;
if (is_jack_detectable(codec, nid) &&
!snd_hda_jack_tbl_get(codec, nid))
snd_hda_codec_update_cache(codec, nid, 0,
AC_VERB_SET_UNSOLICITED_ENABLE, 0);
}
}

int snd_hda_gen_init(struct hda_codec *codec)
{
struct hda_gen_spec *spec = codec->spec;
Expand All @@ -3550,6 +3567,8 @@ int snd_hda_gen_init(struct hda_codec *codec)
init_input_src(codec);
init_digital(codec);

clear_unsol_on_unused_pins(codec);

/* call init functions of standard auto-mute helpers */
snd_hda_gen_hp_automute(codec, NULL);
snd_hda_gen_line_automute(codec, NULL);
Expand Down

0 comments on commit bcafb1a

Please sign in to comment.