diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:51:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:51:31 +0200 |
| commit | 6de15b2a9330aeb5df9b66545f67c6c6ad2c045a (patch) | |
| tree | f3b70a255106a76b57c32056a154dd1a369f3830 /sound/pci/hda/patch_hdmi.c | |
| parent | Merge branch 'topic/asoc' into for-linus (diff) | |
| parent | ALSA: hda/realtek - Fix unused variable compile warning (diff) | |
| download | linux-6de15b2a9330aeb5df9b66545f67c6c6ad2c045a.tar.xz linux-6de15b2a9330aeb5df9b66545f67c6c6ad2c045a.zip | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 83f345f3c961..ad319d4dc32f 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1592,10 +1592,10 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo, unsigned int dataDCC2, channel_id; int i; struct hdmi_spec *spec = codec->spec; - struct hda_spdif_out *spdif = - snd_hda_spdif_out_of_nid(codec, spec->cvts[0].cvt_nid); + struct hda_spdif_out *spdif; mutex_lock(&codec->spdif_mutex); + spdif = snd_hda_spdif_out_of_nid(codec, spec->cvts[0].cvt_nid); chs = substream->runtime->channels; |