Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 148394
b: refs/heads/master
c: 7670dc4
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai committed Apr 20, 2009
1 parent c5bf917 commit f52da78
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 67667263674663767ddf4250bab2437a00ee780e
refs/heads/master: 7670dc41b51983b369f9adfb8694a580e7b0cef2
6 changes: 2 additions & 4 deletions trunk/sound/pci/hda/patch_ca0110.c
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,7 @@ static void parse_line_outs(struct hda_codec *codec)
n = 0;
for (i = 0; i < cfg->line_outs; i++) {
nid = cfg->line_out_pins[i];
def_conf = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_CONFIG_DEFAULT, 0);
def_conf = snd_hda_codec_get_pincfg(codec, nid);
if (!def_conf)
continue; /* invalid pin */
if (snd_hda_get_connections(codec, nid, &spec->dacs[i], 1) != 1)
Expand All @@ -432,8 +431,7 @@ static void parse_hp_out(struct hda_codec *codec)
if (!cfg->hp_outs)
return;
nid = cfg->hp_pins[0];
def_conf = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_CONFIG_DEFAULT, 0);
def_conf = snd_hda_codec_get_pincfg(codec, nid);
if (!def_conf) {
cfg->hp_outs = 0;
return;
Expand Down

0 comments on commit f52da78

Please sign in to comment.