diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-25 11:56:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-25 11:56:25 +0100 |
| commit | 0e19e7d2bff0ec04fe4dc920c580d8a321afa07f (patch) | |
| tree | 9e784e7556a92172a0b27465e0b081437e44335e /sound/pci/hda/hda_codec.c | |
| parent | 82894b6f6f109722070d4d78730fe50cdaba9443 (diff) | |
| parent | f73d35853e9263c7c404f0d6c0fe3d83fc6fd5c0 (diff) | |
Merge branch 'topic/fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index d56d11ab20a..53f64eb75ec 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1586,12 +1586,12 @@ static void set_dig_out(struct hda_codec *codec, hda_nid_t nid, { hda_nid_t *d; - snd_hda_codec_write(codec, nid, 0, verb, val); + snd_hda_codec_write_cache(codec, nid, 0, verb, val); d = codec->slave_dig_outs; if (!d) return; for (; *d; d++) - snd_hda_codec_write(codec, *d, 0, verb, val); + snd_hda_codec_write_cache(codec, *d, 0, verb, val); } static inline void set_dig_out_convert(struct hda_codec *codec, hda_nid_t nid, |