Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353215
b: refs/heads/master
c: 25368c4
h: refs/heads/master
i:
  353213: 1a4a15a
  353211: 6894866
  353207: 9c4c26c
  353199: b980c73
  353183: a29ffcf
  353151: b486281
v: v3
  • Loading branch information
Takashi Iwai committed Jan 24, 2013
1 parent 8f3f781 commit 37b28b2
Show file tree
Hide file tree
Showing 2 changed files with 9 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: 7dddf2aed8ffc1fa30df92b57981dea146cdfc0f
refs/heads/master: 25368c47aee6d909923001918041f2e94bfa02ef
12 changes: 8 additions & 4 deletions trunk/sound/pci/hda/patch_via.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,10 @@ static void set_widgets_power_state(struct hda_codec *codec)
static void update_power_state(struct hda_codec *codec, hda_nid_t nid,
unsigned int parm)
{
if (snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_POWER_STATE, 0) == parm)
unsigned int state = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_POWER_STATE, 0);
state = (state >> 4) & 0x0f;
if (state == parm)
return;
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, parm);
}
Expand All @@ -251,8 +253,10 @@ static void update_conv_power_state(struct hda_codec *codec, hda_nid_t nid,
{
struct via_spec *spec = codec->spec;
unsigned int format;
if (snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_POWER_STATE, 0) == parm)
unsigned int state = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_POWER_STATE, 0);
state = (state >> 4) & 0x0f;
if (state == parm)
return;
format = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0);
if (format && (spec->dac_stream_tag[index] != format))
Expand Down

0 comments on commit 37b28b2

Please sign in to comment.